C++: Accept test changes.

MathiasVP · MathiasVP · commit 86d8e362a11b · 2026-04-28T10:50:50.000+01:00
diff --git a/cpp/ql/test/library-tests/dataflow/source-sink-tests/sources-and-sinks.cpp b/cpp/ql/test/library-tests/dataflow/source-sink-tests/sources-and-sinks.cpp
@@ -122,12 +122,12 @@ long StringCchGetsExA(char *, size_t, char **, size_t *, unsigned long);
 void test_strsafe_gets() {
 	{
 		char dest[256] = {0};
-		StringCchGetsA(dest, sizeof(dest)); // $ MISSING: local_source
+		StringCchGetsA(dest, sizeof(dest)); // $ local_source
 	}
 	{
 		char dest[256] = {0};
 		char *end;
 		size_t remaining;
-		StringCchGetsExA(dest, sizeof(dest), &end, &remaining, 0); // $ MISSING: local_source
+		StringCchGetsExA(dest, sizeof(dest), &end, &remaining, 0); // $ local_source
 	}
 }
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
@@ -895,98 +895,98 @@ void test_strsafe() {
 	{
 		char dest[256] = {0};
 		StringCchCopyA(dest, sizeof(dest), source);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		wchar_t dest[256] = {0};
 		StringCchCopyW(dest, sizeof(dest), wsource);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = {0};
 		StringCbCopyA(dest, sizeof(dest), source);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = {0};
 		char *end;
 		size_t remaining;
 		StringCchCopyExA(dest, sizeof(dest), source, &end, &remaining, 0);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = {0};
 		StringCchCopyNA(dest, sizeof(dest), source, 128);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = {0};
 		char *end;
 		size_t remaining;
 		StringCchCopyNExA(dest, sizeof(dest), source, 128, &end, &remaining, 0);
-		sink(dest); // $ MISSING: ir,ast
+		sink(dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = "prefix";
 		StringCchCatA(dest, sizeof(dest), source);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		wchar_t dest[256] = L"prefix";
 		StringCchCatW(dest, sizeof(dest), wsource);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = "prefix";
 		StringCbCatA(dest, sizeof(dest), source);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = "prefix";
 		char *end;
 		size_t remaining;
 		StringCchCatExA(dest, sizeof(dest), source, &end, &remaining, 0);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = "prefix";
 		StringCchCatNA(dest, sizeof(dest), source, 128);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = "prefix";
 		char *end;
 		size_t remaining;
 		StringCchCatNExA(dest, sizeof(dest), source, 128, &end, &remaining, 0);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = {0};
 		StringCchPrintfA(dest, sizeof(dest), "%s", source);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		wchar_t dest[256] = {0};
 		StringCchPrintfW(dest, sizeof(dest), L"%s", wsource);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = {0};
 		StringCbPrintfA(dest, sizeof(dest), "%s", source);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = {0};
 		char *end;
 		size_t remaining;
 		StringCchPrintfExA(dest, sizeof(dest), &end, &remaining, 0, "%s", source);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = {0};
 		char *fmt = indirect_source();
 		StringCchPrintfA(dest, sizeof(dest), fmt);
-		sink(*dest); // $ MISSING: ir,ast
+		sink(*dest); // $ ir MISSING: ast
 	}
 	{
 		char dest[256] = {0};

Original file line number	Diff line number	Diff line change
`@@ -122,12 +122,12 @@ long StringCchGetsExA(char , size_t, char , size_t , unsigned long);`
`122`	`122`	`void test_strsafe_gets() {`
`123`	`123`	`{`
`124`	`124`	`char dest[256] = {0};`
`125`		`- StringCchGetsA(dest, sizeof(dest)); // $ MISSING: local_source`
	`125`	`+ StringCchGetsA(dest, sizeof(dest)); // $ local_source`
`126`	`126`	`}`
`127`	`127`	`{`
`128`	`128`	`char dest[256] = {0};`
`129`	`129`	`char *end;`
`130`	`130`	`size_t remaining;`
`131`		`- StringCchGetsExA(dest, sizeof(dest), &end, &remaining, 0); // $ MISSING: local_source`
	`131`	`+ StringCchGetsExA(dest, sizeof(dest), &end, &remaining, 0); // $ local_source`
`132`	`132`	`}`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -895,98 +895,98 @@ void test_strsafe() {`
`895`	`895`	`{`
`896`	`896`	`char dest[256] = {0};`
`897`	`897`	`StringCchCopyA(dest, sizeof(dest), source);`
`898`		`- sink(*dest); // $ MISSING: ir,ast`
	`898`	`+ sink(*dest); // $ ir MISSING: ast`
`899`	`899`	`}`
`900`	`900`	`{`
`901`	`901`	`wchar_t dest[256] = {0};`
`902`	`902`	`StringCchCopyW(dest, sizeof(dest), wsource);`
`903`		`- sink(*dest); // $ MISSING: ir,ast`
	`903`	`+ sink(*dest); // $ ir MISSING: ast`
`904`	`904`	`}`
`905`	`905`	`{`
`906`	`906`	`char dest[256] = {0};`
`907`	`907`	`StringCbCopyA(dest, sizeof(dest), source);`
`908`		`- sink(*dest); // $ MISSING: ir,ast`
	`908`	`+ sink(*dest); // $ ir MISSING: ast`
`909`	`909`	`}`
`910`	`910`	`{`
`911`	`911`	`char dest[256] = {0};`
`912`	`912`	`char *end;`
`913`	`913`	`size_t remaining;`
`914`	`914`	`StringCchCopyExA(dest, sizeof(dest), source, &end, &remaining, 0);`
`915`		`- sink(*dest); // $ MISSING: ir,ast`
	`915`	`+ sink(*dest); // $ ir MISSING: ast`
`916`	`916`	`}`
`917`	`917`	`{`
`918`	`918`	`char dest[256] = {0};`
`919`	`919`	`StringCchCopyNA(dest, sizeof(dest), source, 128);`
`920`		`- sink(*dest); // $ MISSING: ir,ast`
	`920`	`+ sink(*dest); // $ ir MISSING: ast`
`921`	`921`	`}`
`922`	`922`	`{`
`923`	`923`	`char dest[256] = {0};`
`924`	`924`	`char *end;`
`925`	`925`	`size_t remaining;`
`926`	`926`	`StringCchCopyNExA(dest, sizeof(dest), source, 128, &end, &remaining, 0);`
`927`		`- sink(dest); // $ MISSING: ir,ast`
	`927`	`+ sink(dest); // $ ir MISSING: ast`
`928`	`928`	`}`
`929`	`929`	`{`
`930`	`930`	`char dest[256] = "prefix";`
`931`	`931`	`StringCchCatA(dest, sizeof(dest), source);`
`932`		`- sink(*dest); // $ MISSING: ir,ast`
	`932`	`+ sink(*dest); // $ ir MISSING: ast`
`933`	`933`	`}`
`934`	`934`	`{`
`935`	`935`	`wchar_t dest[256] = L"prefix";`
`936`	`936`	`StringCchCatW(dest, sizeof(dest), wsource);`
`937`		`- sink(*dest); // $ MISSING: ir,ast`
	`937`	`+ sink(*dest); // $ ir MISSING: ast`
`938`	`938`	`}`
`939`	`939`	`{`
`940`	`940`	`char dest[256] = "prefix";`
`941`	`941`	`StringCbCatA(dest, sizeof(dest), source);`
`942`		`- sink(*dest); // $ MISSING: ir,ast`
	`942`	`+ sink(*dest); // $ ir MISSING: ast`
`943`	`943`	`}`
`944`	`944`	`{`
`945`	`945`	`char dest[256] = "prefix";`
`946`	`946`	`char *end;`
`947`	`947`	`size_t remaining;`
`948`	`948`	`StringCchCatExA(dest, sizeof(dest), source, &end, &remaining, 0);`
`949`		`- sink(*dest); // $ MISSING: ir,ast`
	`949`	`+ sink(*dest); // $ ir MISSING: ast`
`950`	`950`	`}`
`951`	`951`	`{`
`952`	`952`	`char dest[256] = "prefix";`
`953`	`953`	`StringCchCatNA(dest, sizeof(dest), source, 128);`
`954`		`- sink(*dest); // $ MISSING: ir,ast`
	`954`	`+ sink(*dest); // $ ir MISSING: ast`
`955`	`955`	`}`
`956`	`956`	`{`
`957`	`957`	`char dest[256] = "prefix";`
`958`	`958`	`char *end;`
`959`	`959`	`size_t remaining;`
`960`	`960`	`StringCchCatNExA(dest, sizeof(dest), source, 128, &end, &remaining, 0);`
`961`		`- sink(*dest); // $ MISSING: ir,ast`
	`961`	`+ sink(*dest); // $ ir MISSING: ast`
`962`	`962`	`}`
`963`	`963`	`{`
`964`	`964`	`char dest[256] = {0};`
`965`	`965`	`StringCchPrintfA(dest, sizeof(dest), "%s", source);`
`966`		`- sink(*dest); // $ MISSING: ir,ast`
	`966`	`+ sink(*dest); // $ ir MISSING: ast`
`967`	`967`	`}`
`968`	`968`	`{`
`969`	`969`	`wchar_t dest[256] = {0};`
`970`	`970`	`StringCchPrintfW(dest, sizeof(dest), L"%s", wsource);`
`971`		`- sink(*dest); // $ MISSING: ir,ast`
	`971`	`+ sink(*dest); // $ ir MISSING: ast`
`972`	`972`	`}`
`973`	`973`	`{`
`974`	`974`	`char dest[256] = {0};`
`975`	`975`	`StringCbPrintfA(dest, sizeof(dest), "%s", source);`
`976`		`- sink(*dest); // $ MISSING: ir,ast`
	`976`	`+ sink(*dest); // $ ir MISSING: ast`
`977`	`977`	`}`
`978`	`978`	`{`
`979`	`979`	`char dest[256] = {0};`
`980`	`980`	`char *end;`
`981`	`981`	`size_t remaining;`
`982`	`982`	`StringCchPrintfExA(dest, sizeof(dest), &end, &remaining, 0, "%s", source);`
`983`		`- sink(*dest); // $ MISSING: ir,ast`
	`983`	`+ sink(*dest); // $ ir MISSING: ast`
`984`	`984`	`}`
`985`	`985`	`{`
`986`	`986`	`char dest[256] = {0};`
`987`	`987`	`char *fmt = indirect_source();`
`988`	`988`	`StringCchPrintfA(dest, sizeof(dest), fmt);`
`989`		`- sink(*dest); // $ MISSING: ir,ast`
	`989`	`+ sink(*dest); // $ ir MISSING: ast`
`990`	`990`	`}`
`991`	`991`	`{`
`992`	`992`	`char dest[256] = {0};`