Merge branch 'master' of https://github.com/lemire/simdjson

geofflangdale · geofflangdale · commit 527ee8eace58 · 2019-02-23T11:28:48.000+11:00
diff --git a/singleheader/amalgamation_demo.cpp b/singleheader/amalgamation_demo.cpp
@@ -1,4 +1,4 @@
-/* auto-generated on Fri 22 Feb 2019 15:42:34 EST. Do not edit! */
+/* auto-generated on Fri 22 Feb 2019 19:16:31 EST. Do not edit! */
 
 #include <iostream>
 #include "simdjson.h"
diff --git a/singleheader/simdjson.cpp b/singleheader/simdjson.cpp
@@ -1,4 +1,4 @@
-/* auto-generated on Fri 22 Feb 2019 15:42:34 EST. Do not edit! */
+/* auto-generated on Fri 22 Feb 2019 19:16:31 EST. Do not edit! */
 #include "simdjson.h"
 
 /* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */
@@ -797,6 +797,10 @@ WARN_UNUSED
     base = next_base;
 
   pj.n_structural_indexes = base;
+  // a valid JSON file cannot have zero structural indexes - we should have found something
+  if (!pj.n_structural_indexes) {
+    return false;
+  }
   if(base_ptr[pj.n_structural_indexes-1] > len) {
     fprintf( stderr,"Internal bug\n");
     return false;
diff --git a/singleheader/simdjson.h b/singleheader/simdjson.h
@@ -1,4 +1,4 @@
-/* auto-generated on Fri 22 Feb 2019 15:42:34 EST. Do not edit! */
+/* auto-generated on Fri 22 Feb 2019 19:16:31 EST. Do not edit! */
 /* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/portability.h */
 #ifndef SIMDJSON_PORTABILITY_H
 #define SIMDJSON_PORTABILITY_H

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* auto-generated on Fri 22 Feb 2019 15:42:34 EST. Do not edit! */`
	`1`	`+/* auto-generated on Fri 22 Feb 2019 19:16:31 EST. Do not edit! */`
`2`	`2`
`3`	`3`	`#include <iostream>`
`4`	`4`	`#include "simdjson.h"`