Skip to content

Commit ad3605c

Browse files
jketemajketema
committed
C++: Minor test clean up
1 parent d8a70d8 commit ad3605c

File tree

7 files changed

+39
-67
lines changed

7 files changed

+39
-67
lines changed

‎cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/DecompressionBombs.expected‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
edges
2-
| brotliTest.cpp:26:40:26:43 | **argv | brotliTest.cpp:26:40:26:43 | **argv | provenance | |
3-
| brotliTest.cpp:26:40:26:43 | **argv | brotliTest.cpp:28:42:28:60 | *access to array | provenance | |
4-
| brotliTest.cpp:26:40:26:43 | **argv | brotliTest.cpp:34:35:34:40 | *input2 | provenance | TaintFunction |
2+
| brotliTest.cpp:26:41:26:44 | **argv | brotliTest.cpp:26:41:26:44 | **argv | provenance | |
3+
| brotliTest.cpp:26:41:26:44 | **argv | brotliTest.cpp:28:42:28:60 | *access to array | provenance | |
4+
| brotliTest.cpp:26:41:26:44 | **argv | brotliTest.cpp:34:35:34:40 | *input2 | provenance | TaintFunction |
55
| libarchiveTests.cpp:49:38:49:39 | *ar | libarchiveTests.cpp:49:38:49:39 | *ar | provenance | |
66
| libarchiveTests.cpp:49:38:49:39 | *ar | libarchiveTests.cpp:56:33:56:34 | *ar | provenance | |
77
| libarchiveTests.cpp:68:33:68:40 | *filename | libarchiveTests.cpp:86:40:86:47 | *filename | provenance | |
@@ -10,30 +10,30 @@ edges
1010
| libarchiveTests.cpp:92:23:92:23 | *a | libarchiveTests.cpp:49:38:49:39 | *ar | provenance | |
1111
| libarchiveTests.cpp:92:23:92:23 | *a | libarchiveTests.cpp:92:23:92:23 | copy_data output argument | provenance | |
1212
| libarchiveTests.cpp:92:23:92:23 | copy_data output argument | libarchiveTests.cpp:92:23:92:23 | *a | provenance | |
13-
| libarchiveTests.cpp:107:44:107:47 | **argv | libarchiveTests.cpp:107:44:107:47 | **argv | provenance | |
14-
| libarchiveTests.cpp:107:44:107:47 | **argv | libarchiveTests.cpp:108:13:108:19 | *access to array | provenance | |
13+
| libarchiveTests.cpp:107:45:107:48 | **argv | libarchiveTests.cpp:107:45:107:48 | **argv | provenance | |
14+
| libarchiveTests.cpp:107:45:107:48 | **argv | libarchiveTests.cpp:108:13:108:19 | *access to array | provenance | |
1515
| libarchiveTests.cpp:108:13:108:19 | *access to array | libarchiveTests.cpp:68:33:68:40 | *filename | provenance | |
1616
| main.cpp:7:33:7:36 | **argv | main.cpp:8:23:8:26 | **argv | provenance | |
1717
| main.cpp:7:33:7:36 | **argv | main.cpp:9:27:9:30 | **argv | provenance | |
1818
| main.cpp:7:33:7:36 | **argv | main.cpp:10:24:10:27 | **argv | provenance | |
1919
| main.cpp:7:33:7:36 | **argv | main.cpp:11:21:11:24 | **argv | provenance | |
20-
| main.cpp:8:23:8:26 | **argv | brotliTest.cpp:26:40:26:43 | **argv | provenance | |
20+
| main.cpp:8:23:8:26 | **argv | brotliTest.cpp:26:41:26:44 | **argv | provenance | |
2121
| main.cpp:8:23:8:26 | **argv | main.cpp:8:23:8:26 | brotli_test output argument | provenance | |
2222
| main.cpp:8:23:8:26 | brotli_test output argument | main.cpp:9:27:9:30 | **argv | provenance | |
2323
| main.cpp:8:23:8:26 | brotli_test output argument | main.cpp:10:24:10:27 | **argv | provenance | |
2424
| main.cpp:8:23:8:26 | brotli_test output argument | main.cpp:11:21:11:24 | **argv | provenance | |
25-
| main.cpp:9:27:9:30 | **argv | libarchiveTests.cpp:107:44:107:47 | **argv | provenance | |
25+
| main.cpp:9:27:9:30 | **argv | libarchiveTests.cpp:107:45:107:48 | **argv | provenance | |
2626
| main.cpp:9:27:9:30 | **argv | main.cpp:9:27:9:30 | libarchive_test output argument | provenance | |
2727
| main.cpp:9:27:9:30 | libarchive_test output argument | main.cpp:10:24:10:27 | **argv | provenance | |
2828
| main.cpp:9:27:9:30 | libarchive_test output argument | main.cpp:11:21:11:24 | **argv | provenance | |
2929
| main.cpp:10:24:10:27 | **argv | main.cpp:10:24:10:27 | minizip_test output argument | provenance | |
30-
| main.cpp:10:24:10:27 | **argv | minizipTest.cpp:34:41:34:44 | **argv | provenance | |
30+
| main.cpp:10:24:10:27 | **argv | minizipTest.cpp:34:42:34:45 | **argv | provenance | |
3131
| main.cpp:10:24:10:27 | minizip_test output argument | main.cpp:11:21:11:24 | **argv | provenance | |
32-
| main.cpp:11:21:11:24 | **argv | zlibTest.cpp:168:32:168:35 | **argv | provenance | |
33-
| minizipTest.cpp:34:41:34:44 | **argv | minizipTest.cpp:34:41:34:44 | **argv | provenance | |
34-
| minizipTest.cpp:34:41:34:44 | **argv | minizipTest.cpp:40:52:40:67 | *access to array | provenance | |
35-
| minizipTest.cpp:34:41:34:44 | **argv | minizipTest.cpp:52:41:52:47 | *access to array | provenance | |
36-
| minizipTest.cpp:34:41:34:44 | **argv | minizipTest.cpp:67:13:67:19 | *access to array | provenance | |
32+
| main.cpp:11:21:11:24 | **argv | zlibTest.cpp:168:33:168:36 | **argv | provenance | |
33+
| minizipTest.cpp:34:42:34:45 | **argv | minizipTest.cpp:34:42:34:45 | **argv | provenance | |
34+
| minizipTest.cpp:34:42:34:45 | **argv | minizipTest.cpp:40:52:40:67 | *access to array | provenance | |
35+
| minizipTest.cpp:34:42:34:45 | **argv | minizipTest.cpp:52:41:52:47 | *access to array | provenance | |
36+
| minizipTest.cpp:34:42:34:45 | **argv | minizipTest.cpp:67:13:67:19 | *access to array | provenance | |
3737
| minizipTest.cpp:52:29:52:38 | **zip_reader | minizipTest.cpp:58:30:58:39 | **zip_reader | provenance | |
3838
| minizipTest.cpp:52:29:52:38 | *zip_reader | minizipTest.cpp:58:30:58:39 | *zip_reader | provenance | |
3939
| minizipTest.cpp:52:41:52:47 | *access to array | minizipTest.cpp:52:29:52:38 | **zip_reader | provenance | Config |
@@ -59,11 +59,11 @@ edges
5959
| zlibTest.cpp:132:29:132:36 | *fileName | zlibTest.cpp:131:24:131:31 | *fileName | provenance | |
6060
| zlibTest.cpp:132:29:132:36 | *fileName | zlibTest.cpp:132:22:132:27 | call to gzopen | provenance | Config |
6161
| zlibTest.cpp:156:41:156:45 | *input | zlibTest.cpp:163:29:163:43 | *input | provenance | |
62-
| zlibTest.cpp:168:32:168:35 | **argv | zlibTest.cpp:169:19:169:25 | *access to array | provenance | |
63-
| zlibTest.cpp:168:32:168:35 | **argv | zlibTest.cpp:170:18:170:24 | *access to array | provenance | |
64-
| zlibTest.cpp:168:32:168:35 | **argv | zlibTest.cpp:171:19:171:25 | *access to array | provenance | |
65-
| zlibTest.cpp:168:32:168:35 | **argv | zlibTest.cpp:172:18:172:24 | *access to array | provenance | |
66-
| zlibTest.cpp:168:32:168:35 | **argv | zlibTest.cpp:174:19:174:66 | *access to array | provenance | |
62+
| zlibTest.cpp:168:33:168:36 | **argv | zlibTest.cpp:169:19:169:25 | *access to array | provenance | |
63+
| zlibTest.cpp:168:33:168:36 | **argv | zlibTest.cpp:170:18:170:24 | *access to array | provenance | |
64+
| zlibTest.cpp:168:33:168:36 | **argv | zlibTest.cpp:171:19:171:25 | *access to array | provenance | |
65+
| zlibTest.cpp:168:33:168:36 | **argv | zlibTest.cpp:172:18:172:24 | *access to array | provenance | |
66+
| zlibTest.cpp:168:33:168:36 | **argv | zlibTest.cpp:174:19:174:66 | *access to array | provenance | |
6767
| zlibTest.cpp:169:19:169:25 | *access to array | zlibTest.cpp:114:25:114:32 | *fileName | provenance | |
6868
| zlibTest.cpp:169:19:169:25 | *access to array | zlibTest.cpp:169:19:169:25 | UnsafeGzfread output argument | provenance | |
6969
| zlibTest.cpp:169:19:169:25 | UnsafeGzfread output argument | zlibTest.cpp:170:18:170:24 | *access to array | provenance | |
@@ -84,8 +84,8 @@ edges
8484
| zlibTest.cpp:172:18:172:24 | UnsafeGzread output argument | zlibTest.cpp:174:19:174:66 | *access to array | provenance | |
8585
| zlibTest.cpp:174:19:174:66 | *access to array | zlibTest.cpp:156:41:156:45 | *input | provenance | |
8686
nodes
87-
| brotliTest.cpp:26:40:26:43 | **argv | semmle.label | **argv |
88-
| brotliTest.cpp:26:40:26:43 | **argv | semmle.label | **argv |
87+
| brotliTest.cpp:26:41:26:44 | **argv | semmle.label | **argv |
88+
| brotliTest.cpp:26:41:26:44 | **argv | semmle.label | **argv |
8989
| brotliTest.cpp:28:42:28:60 | *access to array | semmle.label | *access to array |
9090
| brotliTest.cpp:34:35:34:40 | *input2 | semmle.label | *input2 |
9191
| libarchiveTests.cpp:49:38:49:39 | *ar | semmle.label | *ar |
@@ -96,8 +96,8 @@ nodes
9696
| libarchiveTests.cpp:86:40:86:47 | *filename | semmle.label | *filename |
9797
| libarchiveTests.cpp:92:23:92:23 | *a | semmle.label | *a |
9898
| libarchiveTests.cpp:92:23:92:23 | copy_data output argument | semmle.label | copy_data output argument |
99-
| libarchiveTests.cpp:107:44:107:47 | **argv | semmle.label | **argv |
100-
| libarchiveTests.cpp:107:44:107:47 | **argv | semmle.label | **argv |
99+
| libarchiveTests.cpp:107:45:107:48 | **argv | semmle.label | **argv |
100+
| libarchiveTests.cpp:107:45:107:48 | **argv | semmle.label | **argv |
101101
| libarchiveTests.cpp:108:13:108:19 | *access to array | semmle.label | *access to array |
102102
| main.cpp:7:33:7:36 | **argv | semmle.label | **argv |
103103
| main.cpp:8:23:8:26 | **argv | semmle.label | **argv |
@@ -107,8 +107,8 @@ nodes
107107
| main.cpp:10:24:10:27 | **argv | semmle.label | **argv |
108108
| main.cpp:10:24:10:27 | minizip_test output argument | semmle.label | minizip_test output argument |
109109
| main.cpp:11:21:11:24 | **argv | semmle.label | **argv |
110-
| minizipTest.cpp:34:41:34:44 | **argv | semmle.label | **argv |
111-
| minizipTest.cpp:34:41:34:44 | **argv | semmle.label | **argv |
110+
| minizipTest.cpp:34:42:34:45 | **argv | semmle.label | **argv |
111+
| minizipTest.cpp:34:42:34:45 | **argv | semmle.label | **argv |
112112
| minizipTest.cpp:40:52:40:67 | *access to array | semmle.label | *access to array |
113113
| minizipTest.cpp:52:29:52:38 | **zip_reader | semmle.label | **zip_reader |
114114
| minizipTest.cpp:52:29:52:38 | *zip_reader | semmle.label | *zip_reader |
@@ -141,7 +141,7 @@ nodes
141141
| zlibTest.cpp:139:25:139:31 | inFileZ | semmle.label | inFileZ |
142142
| zlibTest.cpp:156:41:156:45 | *input | semmle.label | *input |
143143
| zlibTest.cpp:163:29:163:43 | *input | semmle.label | *input |
144-
| zlibTest.cpp:168:32:168:35 | **argv | semmle.label | **argv |
144+
| zlibTest.cpp:168:33:168:36 | **argv | semmle.label | **argv |
145145
| zlibTest.cpp:169:19:169:25 | *access to array | semmle.label | *access to array |
146146
| zlibTest.cpp:169:19:169:25 | UnsafeGzfread output argument | semmle.label | UnsafeGzfread output argument |
147147
| zlibTest.cpp:170:18:170:24 | *access to array | semmle.label | *access to array |
@@ -153,9 +153,9 @@ nodes
153153
| zlibTest.cpp:174:19:174:66 | *access to array | semmle.label | *access to array |
154154
subpaths
155155
| libarchiveTests.cpp:92:23:92:23 | *a | libarchiveTests.cpp:49:38:49:39 | *ar | libarchiveTests.cpp:49:38:49:39 | *ar | libarchiveTests.cpp:92:23:92:23 | copy_data output argument |
156-
| main.cpp:8:23:8:26 | **argv | brotliTest.cpp:26:40:26:43 | **argv | brotliTest.cpp:26:40:26:43 | **argv | main.cpp:8:23:8:26 | brotli_test output argument |
157-
| main.cpp:9:27:9:30 | **argv | libarchiveTests.cpp:107:44:107:47 | **argv | libarchiveTests.cpp:107:44:107:47 | **argv | main.cpp:9:27:9:30 | libarchive_test output argument |
158-
| main.cpp:10:24:10:27 | **argv | minizipTest.cpp:34:41:34:44 | **argv | minizipTest.cpp:34:41:34:44 | **argv | main.cpp:10:24:10:27 | minizip_test output argument |
156+
| main.cpp:8:23:8:26 | **argv | brotliTest.cpp:26:41:26:44 | **argv | brotliTest.cpp:26:41:26:44 | **argv | main.cpp:8:23:8:26 | brotli_test output argument |
157+
| main.cpp:9:27:9:30 | **argv | libarchiveTests.cpp:107:45:107:48 | **argv | libarchiveTests.cpp:107:45:107:48 | **argv | main.cpp:9:27:9:30 | libarchive_test output argument |
158+
| main.cpp:10:24:10:27 | **argv | minizipTest.cpp:34:42:34:45 | **argv | minizipTest.cpp:34:42:34:45 | **argv | main.cpp:10:24:10:27 | minizip_test output argument |
159159
| zlibTest.cpp:169:19:169:25 | *access to array | zlibTest.cpp:114:25:114:32 | *fileName | zlibTest.cpp:114:25:114:32 | *fileName | zlibTest.cpp:169:19:169:25 | UnsafeGzfread output argument |
160160
| zlibTest.cpp:170:18:170:24 | *access to array | zlibTest.cpp:131:24:131:31 | *fileName | zlibTest.cpp:131:24:131:31 | *fileName | zlibTest.cpp:170:18:170:24 | UnsafeGzgets output argument |
161161
| zlibTest.cpp:171:19:171:25 | *access to array | zlibTest.cpp:52:25:52:25 | *a | zlibTest.cpp:52:25:52:25 | *a | zlibTest.cpp:171:19:171:25 | UnsafeInflate output argument |

‎cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/brotliTest.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace std {
2323
}
2424
}
2525

26-
int brotli_test(int argc, const char **argv) {
26+
void brotli_test(int argc, const char **argv) {
2727
uint8_t *output = nullptr;
2828
BrotliDecoderDecompress(1024 * 1024, (uint8_t *) argv[2], // BAD
2929
reinterpret_cast<size_t *>(1024 * 1024 * 1024), output);
@@ -34,5 +34,4 @@ int brotli_test(int argc, const char **argv) {
3434
input2, reinterpret_cast<size_t *>(1024 * 1024 * 1024), // BAD
3535
output2,
3636
reinterpret_cast<size_t *>(1024 * 1024 * 1024));
37-
return 0;
3837
}

‎cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/libarchiveTests.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ static void extract(const char *filename) {
104104
}
105105

106106

107-
int libarchive_test(int argc, const char **argv) {
107+
void libarchive_test(int argc, const char **argv) {
108108
extract(argv[1]);
109-
return 0;
110109
}

‎cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/main.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
int brotli_test(int argc, const char **argv);
2-
int libarchive_test(int argc, const char **argv);
3-
int minizip_test(int argc, const char **argv);
4-
int zlib_test(int argc, const char **argv);
5-
int zstd_test(int argc, const char **argv);
1+
void brotli_test(int argc, const char **argv);
2+
void libarchive_test(int argc, const char **argv);
3+
void minizip_test(int argc, const char **argv);
4+
void zlib_test(int argc, const char **argv);
5+
void zstd_test(int argc, const char **argv);
66

77
int main(int argc, const char **argv) {
88
brotli_test(argc, argv);

‎cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/minizipTest.cpp‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void *mz_zip_create() {
3131
return nullptr;
3232
}
3333

34-
int minizip_test(int argc, const char **argv) {
34+
void minizip_test(int argc, const char **argv) {
3535
void *zip_handle = mz_zip_create();
3636
int32_t bytes_read;
3737
int32_t err;
@@ -65,29 +65,4 @@ int minizip_test(int argc, const char **argv) {
6565

6666

6767
UnzOpen(argv[3]); // BAD
68-
return 0;
6968
}
70-
71-
void UnzOpen(const char *path);
72-
73-
int32_t mz_zip_reader_entry_save(void *pVoid, int stream, int write);
74-
75-
void mz_zip_reader_delete(void **pVoid);
76-
77-
void mz_zip_reader_close(void *pVoid);
78-
79-
void mz_stream_os_delete(void **pVoid);
80-
81-
void mz_stream_os_close(void *pVoid);
82-
83-
int32_t mz_stream_os_open(void *pVoid, const char *path, int write);
84-
85-
int32_t mz_zip_reader_goto_first_entry(void *pVoid);
86-
87-
void *mz_zip_reader_create();
88-
89-
int32_t mz_zip_reader_open_file(void *handle, const char *path);
90-
91-
int32_t mz_zip_reader_open_file_in_memory(void *handle, const char *path);
92-
93-
void *mz_stream_os_create();

‎cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/zlibTest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ typedef unsigned char Bytef;
151151
#define Z_OK 0
152152

153153
int uncompress(Bytef *dest, uLongf *destLen,
154-
const Bytef *source, uLong sourceLen) { return 0; }
154+
const Bytef *source, uLong sourceLen);
155155

156156
bool InflateString(const unsigned char *input, const unsigned char *output, size_t output_length) {
157157
uLong source_length;
@@ -165,7 +165,7 @@ bool InflateString(const unsigned char *input, const unsigned char *output, size
165165
return result == Z_OK;
166166
}
167167

168-
int zlib_test(int argc, char **argv) {
168+
void zlib_test(int argc, char **argv) {
169169
UnsafeGzfread(argv[2]);
170170
UnsafeGzgets(argv[2]);
171171
UnsafeInflate(argv[2]);

‎cpp/ql/test/experimental/query-tests/Security/CWE/CWE-409/DecompressionBombs/zstdTest.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ static void decompressFile_orDie(const char *fname) {
8383
}
8484

8585

86-
int zstd_test(int argc, const char **argv) {
86+
void zstd_test(int argc, const char **argv) {
8787
const char *const inFilename = argv[1];
8888
decompressFile_orDie(inFilename);
89-
return 0;
9089
}

0 commit comments

Comments
 (0)