# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1659458832 -7200
# Node ID c90718a28a3cce67d0c4622498e637bf0a72cb29
# Parent  e37e46ef050576902e4885fe1c1b73d5bbfabb2b# Parent  bcd75c07c9e8f5cd0a0cb8364aeb3070f62debcc
maint: Merge stable to default.

diff -r e37e46ef0505 -r c90718a28a3c libinterp/corefcn/oct-stream.cc
--- a/libinterp/corefcn/oct-stream.cc	Fri Jul 29 20:53:45 2022 -0700
+++ b/libinterp/corefcn/oct-stream.cc	Tue Aug 02 18:47:12 2022 +0200
@@ -5042,7 +5042,7 @@
 
                     // If it looks like we have a matching failure, then
                     // reset the failbit in the stream state.
-                    if (is.rdstate () & std::ios::failbit)
+                    if (! is.eof () && is.rdstate () & std::ios::failbit)
                       {
                         error (who, "format failed to match");
                         is.clear (is.rdstate () & (~std::ios::failbit));