Mercurial > octave-antonio

changeset 20148:4a41b7d426b6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix loading of ASCII files with NA values in final column (bug #44967). * lo-utils.cc (read_inf_nan_na): Check that last character read was not an EOF indicator (-1) before attempting to put it back on the stream.
author Rik <rik@octave.org>
date Fri, 01 May 2015 08:29:52 -0700
parents f0a8c1bc3b60
children 6446649e42c1
files liboctave/util/lo-utils.cc
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/util/lo-utils.cc	Fri May 01 08:56:48 2015 +0200
+++ b/liboctave/util/lo-utils.cc	Fri May 01 08:29:52 2015 -0700
@@ -239,7 +239,8 @@
             else
               {
                 val = octave_numeric_limits<T>::NA ();
-                is.putback (c2);
+                if (c2 != EOF)
+                  is.putback (c2);
               }
           }
         else