[CPP-370] Rewrite of NonConstantFormat.ql using the taint tracking library.

zlaski-semmle · zlaski-semmle · commit 098b6543f582 · 2019-05-21T06:51:47.000-07:00
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/NonConstantFormat/test.cpp b/cpp/ql/test/query-tests/Likely Bugs/Format/NonConstantFormat/test.cpp
@@ -10,6 +10,10 @@ const char *messages[] = {
     "%u tasks left\n",
 };
 
+const char *simple_func(const char *str) {
+	return str;
+}
+
 const char *choose_message(unsigned int n) {
   if (n == 0) {
     const char *message = messages[0];
@@ -23,7 +27,7 @@ const char *choose_message(unsigned int n) {
 
 const char *make_message(unsigned int n) {
   static char buf[64];
-  sprintf(buf, "%d tasks left\n", n); // ok
+  sprintf(buf, "%d tasks left\n", n); // OK
   return buf;
 }
 
@@ -42,11 +46,13 @@ const char *const_wash(char *str) {
 
 int main(int argc, char **argv) {
   const char *message = messages[2];
+  printf(simple_func("Hello, World\n")); // OK
   printf(choose_message(argc - 1), argc - 1); // OK
   printf(messages[1]); // OK
   printf(message); // OK
-  printf(make_message(argc - 1)); // NOT OK
+  printf(make_message(argc - 1)); // OK
   printf("Hello, World\n"); // OK
+  printf(gettext("Hello, World\n")); // OK
   printf(_("Hello, World\n")); // OK
   {
     char hello[] = "hello, World\n";
