Address review comments

owen-mc · owen-mc · commit eb44ddedbc81 · 2026-07-07T20:32:49.000+01:00
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-020/NoCheckBeforeUnsafePutUser/test.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-020/NoCheckBeforeUnsafePutUser/test.cpp
@@ -19,7 +19,7 @@ void test1(int p)
 {
 	sys_somesystemcall(&p);
 
-	unsafe_put_user(123, &p); // $ MISSING: Alert // $ MISSING: Alert // BAD [NOT DETECTED]
+	unsafe_put_user(123, &p); // $ MISSING: Alert // BAD [NOT DETECTED]
 }
 
 void test2(int p)
@@ -40,7 +40,7 @@ void test3()
 
 	sys_somesystemcall(&v);
 
-	unsafe_put_user(123, &v); // $ MISSING: Alert // $ MISSING: Alert // BAD [NOT DETECTED]
+	unsafe_put_user(123, &v); // $ MISSING: Alert // BAD [NOT DETECTED]
 }
 
 void test4()
@@ -68,7 +68,7 @@ void test5()
 
 	sys_somesystemcall(&myData);
 
-	unsafe_put_user(123, &(myData.x)); // $ MISSING: Alert // $ MISSING: Alert // BAD [NOT DETECTED]
+	unsafe_put_user(123, &(myData.x)); // $ MISSING: Alert // BAD [NOT DETECTED]
 }
 
 void test6()
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-190/AllocMultiplicationOverflow/test.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-190/AllocMultiplicationOverflow/test.cpp
@@ -24,7 +24,7 @@ void test()
 
 	size_t size2 = x;
 	size2 *= y;
-	char *buffer6 = (char *)malloc(size2); // $ MISSING: Alert // $ MISSING: Alert // BAD [NOT DETECTED]
+	char *buffer6 = (char *)malloc(size2); // $ MISSING: Alert // BAD [NOT DETECTED]
 
 	char *buffer7 = new char[x * 10]; // GOOD
 	char *buffer8 = new char[x * y]; // $ Alert // BAD
diff --git a/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-295/CurlSSL.cpp b/cpp/ql/test/experimental/query-tests/Security/CWE/CWE-295/CurlSSL.cpp
@@ -7,7 +7,7 @@ namespace std{
 		CURLOPT_URL,
 		CURLOPT_SSL_VERIFYHOST,
 		CURLOPT_SSL_VERIFYPEER
-	}; 
+	};
 
 	CURL *curl_easy_init();
 	void curl_easy_cleanup(CURL *handle);
@@ -23,15 +23,15 @@ char host[] = "codeql.com";
 void bad(void) {
 	std::unique_ptr<CURL> curl = std::unique_ptr<CURL>(curl_easy_init());
 	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, 0); // $ Alert
-	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYHOST, 0);  // $ Alert
+	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYHOST, 0); // $ Alert
   	curl_easy_setopt(curl.get(), CURLOPT_URL, host);
   	curl_easy_perform(curl.get());
 }
 
 void good(void) {
 	std::unique_ptr<CURL> curl = std::unique_ptr<CURL>(curl_easy_init());
 	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, 2);
-	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYHOST, 2); 
+	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYHOST, 2);
   	curl_easy_setopt(curl.get(), CURLOPT_URL, host);
   	curl_easy_perform(curl.get());
 }
@@ -40,4 +40,3 @@ int main(int c, char** argv){
 	bad();
   	good();
 }
-
diff --git a/cpp/ql/test/query-tests/Best Practices/Likely Errors/CommaBeforeMisleadingIndentation/test.cpp b/cpp/ql/test/query-tests/Best Practices/Likely Errors/CommaBeforeMisleadingIndentation/test.cpp
@@ -175,7 +175,7 @@ int Foo::test(int (*baz)(int))
 		return i++
 			, i++ // GOOD(?) [FALSE POSITIVE] -- can't exclude w/o source code text :/
 			? 1
-			: 2; // $ Alert
+			: 2; // $ SPURIOUS: Alert
 
     int quux =
       (tata->titi.tutu(),
diff --git a/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedLocals/code2.cpp b/cpp/ql/test/query-tests/Best Practices/Unused Entities/UnusedLocals/code2.cpp
@@ -6,7 +6,7 @@ int test_const_init()
 	int v2; // GOOD
 	int v3 = 0; // $ Alert // BAD: unused
 	int v4 = 0; // GOOD
-	const int v5 = 0; // BAD: unused [NOT DETECTED]
+	const int v5 = 0; // $ MISSING: Alert // BAD: unused [NOT DETECTED]
 	const int v6 = 0; // GOOD
 	constexpr int v7 = 0; // $ Alert // BAD: unused
 	constexpr int v8 = 0; // GOOD
@@ -126,7 +126,7 @@ int test_lambdas1()
 int test_lambdas2()
 {
 	int a, b; // $ Alert // BAD: b is not used
-	auto myLambda = [=]() -> int // BAD: myLambda is not used [NOT DETECTED] (due to containing a Constructor)
+	auto myLambda = [=]() -> int // $ MISSING: Alert // BAD: myLambda is not used [NOT DETECTED] (due to containing a Constructor)
 	{
 		return a;
 	};
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/syntax_errors.c b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/syntax_errors.c
@@ -12,7 +12,7 @@ void test_syntax_error() {
         (UNDEFINED_MACRO)2);
 
     // GOOD [FALSE POSITIVE]
-    printf("%d%d" // $ Alert[cpp/wrong-number-format-arguments]
+    printf("%d%d" // $ SPURIOUS: Alert[cpp/wrong-number-format-arguments]
         UNDEFINED_MACRO,
         1, 2);
 }
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Linux_signed_chars/pri_macros.h b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Linux_signed_chars/pri_macros.h
@@ -11,6 +11,6 @@ void test_PRI_macros() {
 
 	printf("my_u64 = %" PRIu64 "\n", my_u64); // GOOD
 	printf("my_u64 = %" PRIx64 "\n", my_u64); // GOOD
-	printf("my_u64 = %" PRIi64 "\n", my_u64); // BAD: uint64_t read as int64_t [NOT DETECTED]
+	printf("my_u64 = %" PRIi64 "\n", my_u64); // $ MISSING: Alert // BAD: uint64_t read as int64_t [NOT DETECTED]
 	printf("my_u64 = %" PRIu32 "\n", my_u64); // $ Alert // BAD: uint64_t read as uint32_t
 }
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Linux_unsigned_chars/pri_macros.h b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Linux_unsigned_chars/pri_macros.h
@@ -11,6 +11,6 @@ void test_PRI_macros() {
 
 	printf("my_u64 = %" PRIu64 "\n", my_u64); // GOOD
 	printf("my_u64 = %" PRIx64 "\n", my_u64); // GOOD
-	printf("my_u64 = %" PRIi64 "\n", my_u64); // BAD: uint64_t read as int64_t [NOT DETECTED]
+	printf("my_u64 = %" PRIi64 "\n", my_u64); // $ MISSING: Alert // BAD: uint64_t read as int64_t [NOT DETECTED]
 	printf("my_u64 = %" PRIu32 "\n", my_u64); // $ Alert // BAD: uint64_t read as uint32_t
 }
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Microsoft/pri_macros.h b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Microsoft/pri_macros.h
@@ -11,6 +11,6 @@ void test_PRI_macros() {
 
 	printf("my_u64 = %" PRIu64 "\n", my_u64); // GOOD
 	printf("my_u64 = %" PRIx64 "\n", my_u64); // GOOD
-	printf("my_u64 = %" PRIi64 "\n", my_u64); // BAD: uint64_t read as int64_t [NOT DETECTED]
+	printf("my_u64 = %" PRIi64 "\n", my_u64); // $ MISSING: Alert // BAD: uint64_t read as int64_t [NOT DETECTED]
 	printf("my_u64 = %" PRIu32 "\n", my_u64); // $ Alert // BAD: uint64_t read as uint32_t
 }
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Microsoft_no_wchar/pri_macros.h b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Microsoft_no_wchar/pri_macros.h
@@ -11,6 +11,6 @@ void test_PRI_macros() {
 
 	printf("my_u64 = %" PRIu64 "\n", my_u64); // GOOD
 	printf("my_u64 = %" PRIx64 "\n", my_u64); // GOOD
-	printf("my_u64 = %" PRIi64 "\n", my_u64); // BAD: uint64_t read as int64_t [NOT DETECTED]
+	printf("my_u64 = %" PRIi64 "\n", my_u64); // $ MISSING: Alert // BAD: uint64_t read as int64_t [NOT DETECTED]
 	printf("my_u64 = %" PRIu32 "\n", my_u64); // $ Alert // BAD: uint64_t read as uint32_t
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ void test1(int p)`
`19`	`19`	`{`
`20`	`20`	`sys_somesystemcall(&p);`
`21`	`21`
`22`		`- unsafe_put_user(123, &p); // $ MISSING: Alert // $ MISSING: Alert // BAD [NOT DETECTED]`
	`22`	`+ unsafe_put_user(123, &p); // $ MISSING: Alert // BAD [NOT DETECTED]`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`void test2(int p)`
`@@ -40,7 +40,7 @@ void test3()`
`40`	`40`
`41`	`41`	`sys_somesystemcall(&v);`
`42`	`42`
`43`		`- unsafe_put_user(123, &v); // $ MISSING: Alert // $ MISSING: Alert // BAD [NOT DETECTED]`
	`43`	`+ unsafe_put_user(123, &v); // $ MISSING: Alert // BAD [NOT DETECTED]`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`void test4()`
`@@ -68,7 +68,7 @@ void test5()`
`68`	`68`
`69`	`69`	`sys_somesystemcall(&myData);`
`70`	`70`
`71`		`- unsafe_put_user(123, &(myData.x)); // $ MISSING: Alert // $ MISSING: Alert // BAD [NOT DETECTED]`
	`71`	`+ unsafe_put_user(123, &(myData.x)); // $ MISSING: Alert // BAD [NOT DETECTED]`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`void test6()`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ void test_syntax_error() {`
`12`	`12`	`(UNDEFINED_MACRO)2);`
`13`	`13`
`14`	`14`	`// GOOD [FALSE POSITIVE]`
`15`		`- printf("%d%d" // $ Alert[cpp/wrong-number-format-arguments]`
	`15`	`+ printf("%d%d" // $ SPURIOUS: Alert[cpp/wrong-number-format-arguments]`
`16`	`16`	`UNDEFINED_MACRO,`
`17`	`17`	`1, 2);`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ void test_PRI_macros() {`
`11`	`11`
`12`	`12`	`printf("my_u64 = %" PRIu64 "\n", my_u64); // GOOD`
`13`	`13`	`printf("my_u64 = %" PRIx64 "\n", my_u64); // GOOD`
`14`		`- printf("my_u64 = %" PRIi64 "\n", my_u64); // BAD: uint64_t read as int64_t [NOT DETECTED]`
	`14`	`+ printf("my_u64 = %" PRIi64 "\n", my_u64); // $ MISSING: Alert // BAD: uint64_t read as int64_t [NOT DETECTED]`
`15`	`15`	`printf("my_u64 = %" PRIu32 "\n", my_u64); // $ Alert // BAD: uint64_t read as uint32_t`
`16`	`16`	`}`