Improved detection of iostream's eof() condition

2 files changed, 4 insertions, 2 deletions

diff --git a/src/csv.cc b/src/csv.cc
index 1e55129e..71b6516a 100644
--- a/src/csv.cc
+++ b/src/csv.cc
@@ -87,7 +87,7 @@ char * csv_reader::next_line(std::istream& in)
   while (in.good() && ! in.eof() && in.peek() == '#')
     in.getline(context.linebuf, parse_context_t::MAX_LINE);
 
-  if (! in.good() || in.eof())
+  if (! in.good() || in.eof() || in.peek() == -1)
     return NULL;
 
   in.getline(context.linebuf, parse_context_t::MAX_LINE);
diff --git a/src/token.cc b/src/token.cc
index afe48b08..1392c29f 100644
--- a/src/token.cc
+++ b/src/token.cc
@@ -148,7 +148,7 @@ void expr_t::token_t::next(std::istream& in, const parse_flags_t& pflags)
 
   char c = peek_next_nonws(in);
 
-  if (in.eof()) {
+  if (in.eof() || c == -1) {
     kind = TOK_EOF;
     return;
   }
@@ -426,6 +426,8 @@ void expr_t::token_t::next(std::istream& in, const parse_flags_t& pflags)
             expected('\0', c);
 
           parse_ident(in);
+        } else {
+          throw_(parse_error, _("Unexpected EOF"));
         }
 
         if (! value.is_string() || value.as_string().empty()) {