C++: Disentangle confusing test results by declaring only a single main

jketema · jketema · commit d526f1d0811d · 2024-09-04T09:51:03.000+02:00
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/DecompressionBombs.expected b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/DecompressionBombs.expected
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/brotliTest.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/brotliTest.cpp
@@ -26,7 +26,7 @@ namespace std {
     }
 }
 
-int main(int argc, const char *argv[]) {
+int brotli_test(int argc, const char **argv) {
     uint8_t *output = nullptr;
     BrotliDecoderDecompress(1024 * 1024, (uint8_t *) argv[2],
                             reinterpret_cast<size_t *>(1024 * 1024 * 1024), output);
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/libarchiveTests.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/libarchiveTests.cpp
@@ -141,7 +141,7 @@ static void extract(const char *filename) {
 }
 
 
-int main(int argc, const char *argv[]) {
+int libarchive_test(int argc, const char **argv) {
     extract(argv[1]);
     return 0;
 }
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/main.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/main.cpp
@@ -0,0 +1,14 @@
+int brotli_test(int argc, const char **argv);
+int libarchive_test(int argc, const char **argv);
+int minizip_test(int argc, const char **argv);
+int zlib_test(int argc, const char **argv);
+int zstd_test(int argc, const char **argv);
+
+int main(int argc, const char **argv) {
+    brotli_test(argc, argv);
+    libarchive_test(argc, argv);
+    minizip_test(argc, argv);
+    zlib_test(argc, argv);
+    zstd_test(argc, argv);
+    return 0;
+}
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/minizipTest.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/minizipTest.cpp
@@ -33,7 +33,7 @@ void *mz_zip_create() {
     return nullptr;
 }
 
-int main(int argc, const char *argv[]) {
+int minizip_test(int argc, const char **argv) {
     void *zip_handle = mz_zip_create();
     int32_t bytes_read;
     int32_t err;
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/zlibTest.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/zlibTest.cpp
@@ -165,7 +165,7 @@ bool InflateString(const unsigned char *input, const unsigned char *output, size
     return result == Z_OK;
 }
 
-int main(int argc, char **argv) {
+int zlib_test(int argc, char **argv) {
     UnsafeGzfread(argv[2]);
     UnsafeGzgets(argv[2]);
     UnsafeInflate(argv[2]);
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/zstdTest.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/zstdTest.cpp
@@ -111,8 +111,8 @@ static void decompressFile_orDie(const char *fname) {
 }
 
 
-int main(int argc, const char **argv) {
+int zstd_test(int argc, const char **argv) {
     const char *const inFilename = argv[1];
     decompressFile_orDie(inFilename);
     return 0;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace std {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-int main(int argc, const char *argv[]) {`
	`29`	`+int brotli_test(int argc, const char **argv) {`
`30`	`30`	`uint8_t *output = nullptr;`
`31`	`31`	`BrotliDecoderDecompress(1024 * 1024, (uint8_t *) argv[2],`
`32`	`32`	`reinterpret_cast<size_t >(1024 1024 * 1024), output);`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ static void extract(const char *filename) {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`
`144`		`-int main(int argc, const char *argv[]) {`
	`144`	`+int libarchive_test(int argc, const char **argv) {`
`145`	`145`	`extract(argv[1]);`
`146`	`146`	`return 0;`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ void *mz_zip_create() {`
`33`	`33`	`return nullptr;`
`34`	`34`	`}`
`35`	`35`
`36`		`-int main(int argc, const char *argv[]) {`
	`36`	`+int minizip_test(int argc, const char **argv) {`
`37`	`37`	`void *zip_handle = mz_zip_create();`
`38`	`38`	`int32_t bytes_read;`
`39`	`39`	`int32_t err;`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ bool InflateString(const unsigned char input, const unsigned char output, size`
`165`	`165`	`return result == Z_OK;`
`166`	`166`	`}`
`167`	`167`
`168`		`-int main(int argc, char **argv) {`
	`168`	`+int zlib_test(int argc, char **argv) {`
`169`	`169`	`UnsafeGzfread(argv[2]);`
`170`	`170`	`UnsafeGzgets(argv[2]);`
`171`	`171`	`UnsafeInflate(argv[2]);`
Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,8 @@ static void decompressFile_orDie(const char *fname) {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`
`114`		`-int main(int argc, const char **argv) {`
	`114`	`+int zstd_test(int argc, const char **argv) {`
`115`	`115`	`const char *const inFilename = argv[1];`
`116`	`116`	`decompressFile_orDie(inFilename);`
`117`	`117`	`return 0;`
`118`		`-}`
	`118`	`+}`