Fix countfields() on the last line of file

Closes #2543
Rdatatable · Jan 2, 2018 · 69d8ccf · 69d8ccf
1 parent 4c427ab
commit 69d8ccf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/inst/tests/tests.Rraw b/inst/tests/tests.Rraw
@@ -11187,6 +11187,8 @@ DT = setNames(data.frame(a = 1, b = 2, c = 3, d = 4), c(NA, "b", "c", NA))
 setnames(DT, c('a', 'b', 'c', 'd'))
 test(1853, names(DT), c('a', 'b', 'c', 'd'))
 
+test(1854, fread("A,B\n "), data.table(A=logical(), B=logical()))  # 2543
+
 ##########################
 
 # TODO: Tests involving GForce functions needs to be run with optimisation level 1 and 2, so that both functions are tested all the time.

diff --git a/src/fread.c b/src/fread.c
@@ -302,7 +302,7 @@ static inline int countfields(const char **pch)
   const char *ch = *pch;
   if (sep==' ') while (*ch==' ') ch++;  // multiple sep==' ' at the start does not mean sep
   skip_white(&ch);
-  if (eol(&ch)) {
+  if (eol(&ch) || ch==eof) {
     *pch = ch+1;
     return 0;
   }