Fix jv_load_file() assertion (fix jqlang#1410)

RicardoAReyes · May 20, 2017 · 10d6605 · 10d6605
1 parent cb3d5af
commit 10d6605
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/jv_file.c b/src/jv_file.c
@@ -30,10 +30,12 @@ jv jv_load_file(const char* filename, int raw) {
   while (!feof(file) && !ferror(file)) {
     size_t n = fread(buf, 1, sizeof(buf)-max_utf8_len, file);
     int len = 0;
-    if (jvp_utf8_backtrack(buf+(n-1), buf, &len) && len > 0) {
-      if (!feof(file) && !ferror(file)) {
-        n += fread(buf+n, 1, len, file);
-      }
+
+    if (n == 0)
+      continue;
+    if (jvp_utf8_backtrack(buf+(n-1), buf, &len) && len > 0 &&
+        !feof(file) && !ferror(file)) {
+      n += fread(buf+n, 1, len, file);
     }
 
     if (raw) {

diff --git a/src/jv_unicode.c b/src/jv_unicode.c
@@ -9,7 +9,7 @@
 // *missing_bytes.  If there are no leading bytes or an invalid byte is
 // encountered, NULL is returned and *missing_bytes is not altered.
 const char* jvp_utf8_backtrack(const char* start, const char* min, int *missing_bytes) {
-  assert(min < start);
+  assert(min <= start);
   if (min == start) {
     return min;
   }