Merge pull request #139 from geoffw0/function-wrappers

jbj · web-flow · commit ab944f3807bf · 2018-09-04T13:36:33.000+02:00
CPP: Make FunctionWithWrappers `toCause` work on builtins.
diff --git a/cpp/ql/src/semmle/code/cpp/security/FunctionWithWrappers.qll b/cpp/ql/src/semmle/code/cpp/security/FunctionWithWrappers.qll
@@ -3,9 +3,14 @@ import PrintfLike
 private import TaintTracking
 
 private
+bindingset[index]
 string toCause(Function func, int index)
 {
-  result = func.getQualifiedName() + "(" + func.getParameter(index).getName() + ")"
+  result = func.getQualifiedName() + "(" + func.getParameter(index).getName() + ")" or
+  (
+    not exists(func.getParameter(index).getName()) and
+    result = func.getQualifiedName() + "(arg " + index + ")"
+  )
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,14 @@ import PrintfLike`
`3`	`3`	`private import TaintTracking`
`4`	`4`
`5`	`5`	`private`
	`6`	`+bindingset[index]`
`6`	`7`	`string toCause(Function func, int index)`
`7`	`8`	`{`
`8`		`- result = func.getQualifiedName() + "(" + func.getParameter(index).getName() + ")"`
	`9`	`+ result = func.getQualifiedName() + "(" + func.getParameter(index).getName() + ")" or`
	`10`	`+ (`
	`11`	`+ not exists(func.getParameter(index).getName()) and`
	`12`	`+ result = func.getQualifiedName() + "(arg " + index + ")"`
	`13`	`+ )`
`9`	`14`	`}`
`10`	`15`
`11`	`16`	`/**`