1 files changed, 13 insertions, 0 deletions

diff --git a/csv.c b/csv.c
index dfc79c9..4d48f01 100644
--- a/csv.c
+++ b/csv.c
@@ -255,6 +255,15 @@ csv_read(csv_t *csv, FILE *in)
         assert(csv != NULL);
         assert(in != NULL);
 
+        /* do not try to read if EOF has already been seen */
+        if ( feof(in) ) {
+                return -1;
+        }
+
+        if ( ferror(in) ) {
+                csv_fatal_error("I/O error", csv->csv_options);
+        }
+
         enum {
                 STATE_START_FIELD,
                 STATE_QUOTED_FIELD,
@@ -376,6 +385,10 @@ csv_read(csv_t *csv, FILE *in)
                         return csv->csv_field.pos;
 
                 case STATE_END_FILE:
+                        if ( ferror(in) ) {
+                                csv_fatal_error("I/O error", csv->csv_options);
+                        }
+
                         if ( csv_string_empty(&csv->csv_string) ) {
                                 return -1;      /* EOF reached */
                         }