More fixing.

lemire · lemire · commit e8d3d784ab06 · 2018-12-10T22:21:03.000-05:00
diff --git a/benchmark/minifiercompetition.cpp b/benchmark/minifiercompetition.cpp
@@ -143,7 +143,7 @@ int main(int argc, char *argv[]) {
   } 
 
   BEST_TIME("json_parse despaced", json_parse((const u8*)buffer, minisize, pj2), true, memcpy(buffer, minibuffer, p.size()), repeat, volume, true);
-
+  free((void*)p.data());
   free(buffer);
   free(ast_buffer);
   free(minibuffer);
diff --git a/benchmark/parse.cpp b/benchmark/parse.cpp
@@ -229,6 +229,7 @@ int main(int argc, char *argv[]) {
   if(dump) {
     isok = isok && pj.dump_raw_tape(std::cout);
   }
+  free((void*)p.data());
   if (!isok) {
     printf(" Parsing failed. \n ");
     return EXIT_FAILURE;
diff --git a/benchmark/parsingcompetition.cpp b/benchmark/parsingcompetition.cpp
@@ -121,6 +121,7 @@ int main(int argc, char *argv[]) {
   void *state;
   if(all) BEST_TIME("ultrajson         ", (UJDecode(buffer, p.size(), NULL, &state) == NULL), false, memcpy(buffer, p.data(), p.size()), repeat, volume, true);
   BEST_TIME("memcpy            ", (memcpy(buffer, p.data(), p.size()) == buffer), true, , repeat, volume, true);
+  free((void*)p.data());
   free(ast_buffer);
   free(buffer);
 }
diff --git a/include/simdjson/jsonioutil.h b/include/simdjson/jsonioutil.h
@@ -26,12 +26,13 @@ char * allocate_padded_buffer(size_t length);
 // throws exceptions in case of failure
 // first element of the pair is a string (null terminated)
 // whereas the second element is the length.
-// caller is responsible to free (free std::pair<u8 *, size_t>.first)
+// caller is responsible to free (free((void*)result.data())))
 // 
 // throws an exception if the file cannot be opened, use try/catch
 //      try {
 //        p = get_corpus(filename);
 //      } catch (const std::exception& e) { 
+//        free((void*)p.data());
 //        std::cout << "Could not load the file " << filename << std::endl;
 //      }
 std::string_view  get_corpus(std::string filename);
diff --git a/src/jsonioutil.cpp b/src/jsonioutil.cpp
@@ -25,9 +25,12 @@ std::string_view get_corpus(std::string filename) {
       throw  std::runtime_error("could not allocate memory");
     }
     std::rewind(fp);
-    std::fread(buf, 1, len, fp);
-    //buf[len] = '\0';// no need
+    size_t readb = std::fread(buf, 1, len, fp);
     std::fclose(fp);
+    if(readb != len) {
+      free(buf);
+      throw  std::runtime_error("could not read the data");
+    }
     return std::string_view(buf,len);
   }
   throw  std::runtime_error("could not load corpus");
diff --git a/tests/allparserscheckfile.cpp b/tests/allparserscheckfile.cpp
@@ -108,7 +108,7 @@ int main(int argc, char *argv[]) {
   printf("fastjson                   : %s \n", fastjson_correct ? "correct":"invalid");
   printf("gason                      : %s \n", gason_correct ? "correct":"invalid");
   printf("ultrajson                  : %s \n", ultrajson_correct ? "correct":"invalid");
-       
+  free((void*)p.data());       
   free(buffer);
   return EXIT_SUCCESS;
 }
diff --git a/tests/jsoncheck.cpp b/tests/jsoncheck.cpp
@@ -75,6 +75,7 @@ bool validate(const char *dirname) {
       }
       ++howmany;
       bool isok = json_parse(p, pj);
+      free((void*)p.data());
       printf("%s\n", isok ? "ok" : "invalid");
       if(contains("EXCLUDE",name)) {
         // skipping
diff --git a/tests/numberparsingcheck.cpp b/tests/numberparsingcheck.cpp
@@ -154,6 +154,7 @@ bool validate(const char *dirname) {
                float_count, invalid_count,
                int_count + float_count + invalid_count);
       }
+      free((void*)p.data());
       free(fullpath);
     }
   }
diff --git a/tests/stringparsingcheck.cpp b/tests/stringparsingcheck.cpp
@@ -343,6 +343,7 @@ bool validate(const char *dirname) {
       total_string_length = 0;
       empty_string = 0;
       bool isok = json_parse(p, pj);
+      free((void*)p.data());
       if (good_string > 0) {
         printf("File %40s %s --- bad strings: %10zu \tgood strings: %10zu\t "
                "empty strings: %10zu "

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ int main(int argc, char *argv[]) {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`BEST_TIME("json_parse despaced", json_parse((const u8*)buffer, minisize, pj2), true, memcpy(buffer, minibuffer, p.size()), repeat, volume, true);`
`146`		`-`
	`146`	`+ free((void*)p.data());`
`147`	`147`	`free(buffer);`
`148`	`148`	`free(ast_buffer);`
`149`	`149`	`free(minibuffer);`
Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,7 @@ int main(int argc, char *argv[]) {`
`229`	`229`	`if(dump) {`
`230`	`230`	`isok = isok && pj.dump_raw_tape(std::cout);`
`231`	`231`	`}`
	`232`	`+ free((void*)p.data());`
`232`	`233`	`if (!isok) {`
`233`	`234`	`printf(" Parsing failed. \n ");`
`234`	`235`	`return EXIT_FAILURE;`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ int main(int argc, char *argv[]) {`
`121`	`121`	`void *state;`
`122`	`122`	`if(all) BEST_TIME("ultrajson ", (UJDecode(buffer, p.size(), NULL, &state) == NULL), false, memcpy(buffer, p.data(), p.size()), repeat, volume, true);`
`123`	`123`	`BEST_TIME("memcpy ", (memcpy(buffer, p.data(), p.size()) == buffer), true, , repeat, volume, true);`
	`124`	`+ free((void*)p.data());`
`124`	`125`	`free(ast_buffer);`
`125`	`126`	`free(buffer);`
`126`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ int main(int argc, char *argv[]) {`
`108`	`108`	`printf("fastjson : %s \n", fastjson_correct ? "correct":"invalid");`
`109`	`109`	`printf("gason : %s \n", gason_correct ? "correct":"invalid");`
`110`	`110`	`printf("ultrajson : %s \n", ultrajson_correct ? "correct":"invalid");`
`111`		`-`
	`111`	`+ free((void*)p.data());`
`112`	`112`	`free(buffer);`
`113`	`113`	`return EXIT_SUCCESS;`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ bool validate(const char *dirname) {`
`75`	`75`	`}`
`76`	`76`	`++howmany;`
`77`	`77`	`bool isok = json_parse(p, pj);`
	`78`	`+ free((void*)p.data());`
`78`	`79`	`printf("%s\n", isok ? "ok" : "invalid");`
`79`	`80`	`if(contains("EXCLUDE",name)) {`
`80`	`81`	`// skipping`
Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ bool validate(const char *dirname) {`
`154`	`154`	`float_count, invalid_count,`
`155`	`155`	`int_count + float_count + invalid_count);`
`156`	`156`	`}`
	`157`	`+ free((void*)p.data());`
`157`	`158`	`free(fullpath);`
`158`	`159`	`}`
`159`	`160`	`}`