jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

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

This commit is contained in:
Geoff Langdale 2019-02-23 11:28:48 +11:00
parent 2a3e9b5476 1f22ed98ac
commit 527ee8eace
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
singleheader/amalgamation_demo.cpp
View File

@ -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 <iostream>
#include "simdjson.h" #include "simdjson.h"

6
singleheader/simdjson.cpp
View File

@ -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" #include "simdjson.h"
/* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */ /* used for http://dmalloc.com/ Dmalloc - Debug Malloc Library */
@ -797,6 +797,10 @@ WARN_UNUSED
base = next_base; base = next_base;
pj.n_structural_indexes = 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) { if(base_ptr[pj.n_structural_indexes-1] > len) {
fprintf( stderr,"Internal bug\n"); fprintf( stderr,"Internal bug\n");
return false; return false;

2
singleheader/simdjson.h
View File

@ -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 */ /* begin file /Users/lemire/CVS/github/simdjson/include/simdjson/portability.h */
#ifndef SIMDJSON_PORTABILITY_H #ifndef SIMDJSON_PORTABILITY_H
#define SIMDJSON_PORTABILITY_H #define SIMDJSON_PORTABILITY_H