Skip to content

Commit caaa912

Browse files
committed
Fix some lines with // $ ... // $ MISSING:
Note that when a line is marked `// BAD [NOT DETECTED]` but actually has an alert, I assume that the `[NOT DETECTED]` is outdated and should be deleted.
1 parent eb44dde commit caaa912

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

cpp/ql/test/query-tests/Critical/MemoryFreed/test_free.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void test_post_dominance1(int *a)
4141
{
4242
if (condition()) free(a); // $ Source[cpp/double-free] Source[cpp/use-after-free]
4343
if (condition()) a[2] = 5; // $ MISSING: Alert // BAD [NOT DETECTED]
44-
if (condition()) free(a); // $ Source[cpp/double-free] Source[cpp/use-after-free] // $ MISSING: Alert // BAD [NOT DETECTED]
44+
if (condition()) free(a); // $ Source[cpp/double-free] Source[cpp/use-after-free] MISSING: Alert // BAD [NOT DETECTED]
4545
a[2] = 5; // $ Alert[cpp/use-after-free] // BAD
4646
free(a); // $ Alert[cpp/double-free] // BAD
4747
}

cpp/ql/test/query-tests/Likely Bugs/Memory Management/StrncpyFlippedArgs/test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void test2()
3434
wcsncpy(buf1, str, wcslen(str)); // $ Alert // BAD
3535
wcsncpy(buf1, str, wcslen(str) + 1); // $ Alert // BAD
3636
wcsncpy(buf1, buf2, sizeof(buf2)); // $ Alert // BAD
37-
wcsncpy(buf1, buf2, sizeof(buf2) / sizeof(wchar_t)); // $ Alert // $ MISSING: Alert // BAD [NOT DETECTED]
37+
wcsncpy(buf1, buf2, sizeof(buf2) / sizeof(wchar_t)); // $ Alert // BAD
3838
}
3939

4040
void test3()

cpp/ql/test/query-tests/Security/CWE/CWE-193/test.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ void test3(int size) {
3939
void test4(int size) {
4040
char* p = (char*)malloc(size - 1);
4141
char* q = p + (size - 1); // $ MISSING: alloc=L40-1
42-
char a = *q; // $ MISSING: deref=L42 // $ MISSING: Alert // BAD [NOT DETECTED]
42+
char a = *q; // $ MISSING: deref=L42 Alert // BAD [NOT DETECTED]
4343
char b = *(q - 1); // GOOD
44-
char c = *(q + 1); // $ MISSING: deref=L44+1 // $ MISSING: Alert // BAD [NOT DETECTED]
44+
char c = *(q + 1); // $ MISSING: deref=L44+1 Alert // BAD [NOT DETECTED]
4545
char d = *(q + size); // $ MISSING: Alert // BAD [NOT DETECTED]
4646
char e = *(q - size); // GOOD
4747
char f = *(q + size + 1); // $ MISSING: Alert // BAD [NOT DETECTED]
@@ -93,7 +93,7 @@ void test6(int size) {
9393
}
9494

9595
for (char* p = arr.begin; p <= arr.end; ++p) {
96-
*p = 0; // $ MISSING: deref=L83->L91->L96 deref=L83->L95->L96 // $ MISSING: Alert // BAD [NOT DETECTED]
96+
*p = 0; // $ MISSING: deref=L83->L91->L96 deref=L83->L95->L96 Alert // BAD [NOT DETECTED]
9797
}
9898

9999
for (char* p = arr.begin; p < arr.end; ++p) {
@@ -107,7 +107,7 @@ void test7_callee(array_t arr) {
107107
}
108108

109109
for (char* p = arr.begin; p <= arr.end; ++p) {
110-
*p = 0; // $ MISSING: deref=L83->L105->L110 deref=L83->L109->L110 // $ MISSING: Alert // BAD [NOT DETECTED]
110+
*p = 0; // $ MISSING: deref=L83->L105->L110 deref=L83->L109->L110 Alert // BAD [NOT DETECTED]
111111
}
112112

113113
for (char* p = arr.begin; p < arr.end; ++p) {
@@ -154,7 +154,7 @@ void test9(int size) {
154154
}
155155

156156
for (char* p = arr->begin; p <= arr->end; ++p) {
157-
*p = 0; // $ MISSING: deref=L144->L156->L157 // $ MISSING: Alert // BAD [NOT DETECTED]
157+
*p = 0; // $ MISSING: deref=L144->L156->L157 Alert // BAD [NOT DETECTED]
158158
}
159159

160160
for (char* p = arr->begin; p < arr->end; ++p) {
@@ -168,7 +168,7 @@ void test10_callee(array_t *arr) {
168168
}
169169

170170
for (char* p = arr->begin; p <= arr->end; ++p) {
171-
*p = 0; // $ MISSING: deref=L144->L166->L171 deref=L144->L170->L171 // $ MISSING: Alert // BAD [NOT DETECTED]
171+
*p = 0; // $ MISSING: deref=L144->L166->L171 deref=L144->L170->L171 Alert // BAD [NOT DETECTED]
172172
}
173173

174174
for (char* p = arr->begin; p < arr->end; ++p) {
@@ -198,7 +198,7 @@ void test12(unsigned len, unsigned index) {
198198
return;
199199
}
200200

201-
p[index] = '\0'; // $ MISSING: deref=L195->L201 // $ MISSING: Alert // BAD [NOT DETECTED]
201+
p[index] = '\0'; // $ MISSING: deref=L195->L201 Alert // BAD [NOT DETECTED]
202202
}
203203

204204
void test13(unsigned len, unsigned index) {
@@ -703,7 +703,7 @@ void test34(unsigned size) {
703703
}
704704

705705
void deref(char* q) {
706-
char x = *q; // $ MISSING: deref=L714->L705->L706 // $ MISSING: Alert // BAD [NOT DETECTED]
706+
char x = *q; // $ MISSING: deref=L714->L705->L706 Alert // BAD [NOT DETECTED]
707707
}
708708

709709
void test35(size_t size, char* q)

cpp/ql/test/query-tests/Security/CWE/CWE-416/semmle/tests/UseAfterFree/test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ template<class T> T test15()
214214
T* x;
215215
use(x); // GOOD
216216
delete x; // $ Source
217-
use(x); // $ Alert // $ MISSING: Alert // BAD [NOT DETECTED]
217+
use(x); // $ Alert // BAD
218218
}
219219
void test15runner(void)
220220
{

0 commit comments

Comments
 (0)