Removing memory leaks.

lemire · lemire · commit 0b48fb8bd7e2 · 2018-12-11T17:20:29.000-05:00
diff --git a/Makefile b/Makefile
@@ -12,10 +12,15 @@ CFLAGS = -march=native  -Idependencies/ujson4c/3rdparty -Idependencies/ujson4c/s
 ifeq ($(SANITIZE),1)
 	CXXFLAGS += -g3 -O0  -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
 	CFLAGS += -g3 -O0  -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined
+else
+ifeq ($(DEBUG),1)
+        CXXFLAGS += -g3 -O0
+        CFLAGS += -g3 -O0
 else
 	CXXFLAGS += -O3
 	CFLAGS += -O3
 endif
+endif
 
 MAINEXECUTABLES=parse minify json2json
 TESTEXECUTABLES=jsoncheck numberparsingcheck stringparsingcheck 
diff --git a/benchmark/minifiercompetition.cpp b/benchmark/minifiercompetition.cpp
@@ -78,7 +78,7 @@ int main(int argc, char *argv[]) {
       std::cout << p.size() << " B ";
     std::cout << std::endl;
   }
-  char *buffer = allocate_aligned_buffer(p.size() + 1);
+  char *buffer = allocate_padded_buffer(p.size() + 1);
   memcpy(buffer, p.data(), p.size());
   buffer[p.size()] = '\0';
 
@@ -111,7 +111,7 @@ int main(int argc, char *argv[]) {
   BEST_TIME("RapidJSON Insitu orig", d.ParseInsitu(buffer).HasParseError(), false,
             memcpy(buffer, p.data(), p.size()), repeat, volume, true);
 
-  char *minibuffer = allocate_aligned_buffer(p.size() + 1);
+  char *minibuffer = allocate_padded_buffer(p.size() + 1);
   size_t minisize = jsonminify((const uint8_t *)p.data(), p.size(), (uint8_t*) minibuffer);
   minibuffer[minisize] = '\0';
 
diff --git a/tests/numberparsingcheck.cpp b/tests/numberparsingcheck.cpp
@@ -154,7 +154,7 @@ bool validate(const char *dirname) {
                float_count, invalid_count,
                int_count + float_count + invalid_count);
       }
-      free(p.data());
+      free((void*)p.data());
       free(fullpath);
     }
   }
diff --git a/tools/json2json.cpp b/tools/json2json.cpp
@@ -89,6 +89,7 @@ int main(int argc, char *argv[]) {
     return EXIT_FAILURE;
   }
   bool is_ok = json_parse(p, pj); // do the parsing, return false on error
+  free((void*)p.data());
   if (!is_ok) {
     std::cerr << " Parsing failed. " << std::endl;
     return EXIT_FAILURE;
diff --git a/tools/minify.cpp b/tools/minify.cpp
@@ -18,4 +18,5 @@ int main(int argc, char *argv[]) {
   }
   jsonminify(p, (char *)p.data());
   printf("%s",p.data());
+  free((void*)p.data());
 }

Original file line number	Diff line number	Diff line change
`@@ -154,7 +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(p.data());`
	`157`	`+ free((void*)p.data());`
`158`	`158`	`free(fullpath);`
`159`	`159`	`}`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ int main(int argc, char *argv[]) {`
`89`	`89`	`return EXIT_FAILURE;`
`90`	`90`	`}`
`91`	`91`	`bool is_ok = json_parse(p, pj); // do the parsing, return false on error`
	`92`	`+ free((void*)p.data());`
`92`	`93`	`if (!is_ok) {`
`93`	`94`	`std::cerr << " Parsing failed. " << std::endl;`
`94`	`95`	`return EXIT_FAILURE;`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,5 @@ int main(int argc, char *argv[]) {`
`18`	`18`	`}`
`19`	`19`	`jsonminify(p, (char *)p.data());`
`20`	`20`	`printf("%s",p.data());`
	`21`	`+ free((void*)p.data());`
`21`	`22`	`}`