Merge branch 'release/v3.0.0-20120510'

1 files changed, 1 insertions, 1 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);