[CPP-370] Add new test file for testing procedurally nested format

zlaski-semmle · zlaski-semmle · commit ae55b7b64361 · 2019-05-21T07:08:13.000-07:00
argument violations.
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/NonConstantFormat/nested.cpp b/cpp/ql/test/query-tests/Likely Bugs/Format/NonConstantFormat/nested.cpp
@@ -18,7 +18,7 @@ extern "C" int snprintf ( char * s, int n, const char * format, ... );
 struct A {
   void do_print(const char *fmt0) {
     char buf[32];
-    snprintf(buf, 32, fmt0);
+    snprintf(buf, 32, fmt0); // BAD [should detect at top-most call]
   }
 };
 
@@ -39,7 +39,7 @@ struct C {
 
 void foo(void) {
   C c;
-  c.do_some_printing(c.ext_fmt_str());
+  c.do_some_printing(c.ext_fmt_str());  // BAD [not detected at this location]
 }
 
 struct some_class {
@@ -54,7 +54,6 @@ struct debug_ {
         va_list args)
     {
         char str[4096];
-        //int length = printf(fmt, args);
         int length = _vsnprintf_s(str, sizeof(str), 0, fmt, args);
         if (length > 0)
         {
@@ -77,5 +76,5 @@ void diagnostic(const char *fmt, ...)
 }
 
 void bar(void) {
-    diagnostic (some_instance->get_fmt());
+    diagnostic (some_instance->get_fmt());  // GOOD
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ extern "C" int snprintf ( char * s, int n, const char * format, ... );`
`18`	`18`	`struct A {`
`19`	`19`	`void do_print(const char *fmt0) {`
`20`	`20`	`char buf[32];`
`21`		`- snprintf(buf, 32, fmt0);`
	`21`	`+ snprintf(buf, 32, fmt0); // BAD [should detect at top-most call]`
`22`	`22`	`}`
`23`	`23`	`};`
`24`	`24`
`@@ -39,7 +39,7 @@ struct C {`
`39`	`39`
`40`	`40`	`void foo(void) {`
`41`	`41`	`C c;`
`42`		`- c.do_some_printing(c.ext_fmt_str());`
	`42`	`+ c.do_some_printing(c.ext_fmt_str()); // BAD [not detected at this location]`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`struct some_class {`
`@@ -54,7 +54,6 @@ struct debug_ {`
`54`	`54`	`va_list args)`
`55`	`55`	`{`
`56`	`56`	`char str[4096];`
`57`		`- //int length = printf(fmt, args);`
`58`	`57`	`int length = _vsnprintf_s(str, sizeof(str), 0, fmt, args);`
`59`	`58`	`if (length > 0)`
`60`	`59`	`{`
`@@ -77,5 +76,5 @@ void diagnostic(const char *fmt, ...)`
`77`	`76`	`}`
`78`	`77`
`79`	`78`	`void bar(void) {`
`80`		`- diagnostic (some_instance->get_fmt());`
	`79`	`+ diagnostic (some_instance->get_fmt()); // GOOD`
`81`	`80`	`}`