CPP: Fix ODASA-3654.

geoffw0 · geoffw0 · commit 69f87d8eeeae · 2019-03-26T12:54:44.000Z
diff --git a/cpp/ql/src/semmle/code/cpp/commons/Printf.qll b/cpp/ql/src/semmle/code/cpp/commons/Printf.qll
@@ -256,11 +256,11 @@ class FormatLiteral extends Literal {
   }
 
   /**
-   * Gets the format string, with '%%' replaced by '_' (to avoid processing
-   * '%%' as a format specifier).
+   * Gets the format string, with '%%' adn '%@' replaced by '_' (to avoid processing
+   * them as format specifiers).
    */
   string getFormat() {
-    result = this.getValue().replaceAll("%%", "_")
+    result = this.getValue().replaceAll("%%", "_").replaceAll("%@", "_")
   }
 
   /**
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/WrongNumberOfFormatArguments.expected b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/WrongNumberOfFormatArguments.expected
@@ -6,4 +6,3 @@
 | test.c:15:2:15:7 | call to printf | Format expects 3 arguments but given 2 |
 | test.c:19:2:19:7 | call to printf | Format expects 2 arguments but given 1 |
 | test.c:29:3:29:8 | call to printf | Format expects 2 arguments but given 1 |
-| test.c:44:2:44:7 | call to printf | Format expects 3 arguments but given 2 |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/test.c b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongNumberOfFormatArguments/test.c
@@ -41,5 +41,5 @@ void test(int i, const char *str)
 		printf("%2$.*4$f", num, 0, precision); // BAD (too few format arguments) [INCORRECT MESSAGE]
 	}
 
-	printf("%@ %i %i", 1, 2); // GOOD [FALSE POSITIVE]
+	printf("%@ %i %i", 1, 2); // GOOD
 }

Original file line number	Diff line number	Diff line change
`@@ -256,11 +256,11 @@ class FormatLiteral extends Literal {`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`/**`
`259`		`- * Gets the format string, with '%%' replaced by '_' (to avoid processing`
`260`		`- * '%%' as a format specifier).`
	`259`	`+ * Gets the format string, with '%%' adn '%@' replaced by '_' (to avoid processing`
	`260`	`+ * them as format specifiers).`
`261`	`261`	`*/`
`262`	`262`	`string getFormat() {`
`263`		`- result = this.getValue().replaceAll("%%", "_")`
	`263`	`+ result = this.getValue().replaceAll("%%", "_").replaceAll("%@", "_")`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ void test(int i, const char *str)`
`41`	`41`	`printf("%2$.*4$f", num, 0, precision); // BAD (too few format arguments) [INCORRECT MESSAGE]`
`42`	`42`	`}`
`43`	`43`
`44`		`- printf("%@ %i %i", 1, 2); // GOOD [FALSE POSITIVE]`
	`44`	`+ printf("%@ %i %i", 1, 2); // GOOD`
`45`	`45`	`}`