Merge pull request github#5085 from geoffw0/msprintf2

jbj · web-flow · commit 7859c5234a88 · 2021-02-06T16:06:35.000+01:00
C++: Fix FormattingFunction regression.
diff --git a/cpp/ql/src/semmle/code/cpp/commons/Printf.qll b/cpp/ql/src/semmle/code/cpp/commons/Printf.qll
@@ -53,7 +53,12 @@ predicate primitiveVariadicFormatter(
   (
     if type = "" then outputParamIndex = -1 else outputParamIndex = 0 // Conveniently, these buffer parameters are all at index 0.
   ) and
-  not exists(f.getBlock()) // exclude functions with an implementation in the snapshot as they may not be standard implementations.
+  not (
+    // exclude functions with an implementation in the snapshot source
+    // directory, as they may not be standard implementations.
+    exists(f.getBlock()) and
+    exists(f.getFile().getRelativePath())
+  )
 }
 
 private predicate callsVariadicFormatter(

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,12 @@ predicate primitiveVariadicFormatter(`
`53`	`53`	`(`
`54`	`54`	`if type = "" then outputParamIndex = -1 else outputParamIndex = 0 // Conveniently, these buffer parameters are all at index 0.`
`55`	`55`	`) and`
`56`		`- not exists(f.getBlock()) // exclude functions with an implementation in the snapshot as they may not be standard implementations.`
	`56`	`+ not (`
	`57`	`+ // exclude functions with an implementation in the snapshot source`
	`58`	`+ // directory, as they may not be standard implementations.`
	`59`	`+ exists(f.getBlock()) and`
	`60`	`+ exists(f.getFile().getRelativePath())`
	`61`	`+ )`
`57`	`62`	`}`
`58`	`63`
`59`	`64`	`private predicate callsVariadicFormatter(`