C++: UsingStrcpyAsBoolean.ql: use getName

jbj · jbj · commit 92fbea4e41e5 · 2019-01-10T08:35:54.000+01:00
We agreed in the review of the original PR that `getName` is more
appropriate here than `getQualifiedName`. Using `getName` ensures that
we also match the `std::`-prefixed versions of these functions as well
as user-defined versions.
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/UsingStrcpyAsBoolean.ql b/cpp/ql/src/Likely Bugs/Likely Typos/UsingStrcpyAsBoolean.ql
@@ -36,12 +36,12 @@ predicate isBoolean(Expr e1) {
 predicate isStringCopyCastedAsBoolean(FunctionCall func, Expr expr1, string msg) {
   DataFlow::localFlow(DataFlow::exprNode(func), DataFlow::exprNode(expr1)) and
   isBoolean(expr1.getConversion*()) and
-  isStringComparisonFunction(func.getTarget().getQualifiedName()) and
-  msg = "Return value of " + func.getTarget().getQualifiedName() + " used as Boolean."
+  isStringComparisonFunction(func.getTarget().getName()) and
+  msg = "Return value of " + func.getTarget().getName() + " used as Boolean."
 }
 
 predicate isStringCopyUsedInLogicalOperationOrCondition(FunctionCall func, Expr expr1, string msg) {
-  isStringComparisonFunction(func.getTarget().getQualifiedName()) and
+  isStringComparisonFunction(func.getTarget().getName()) and
   (
     (
       // it is being used in an equality or logical operation
@@ -60,7 +60,7 @@ predicate isStringCopyUsedInLogicalOperationOrCondition(FunctionCall func, Expr
         func = ble.getAnOperand()
       )
     ) and
-    msg = "Return value of " + func.getTarget().getQualifiedName() +
+    msg = "Return value of " + func.getTarget().getName() +
         " used in a logical operation."
     or
     // or the string copy function is used directly as the conditional expression
@@ -75,7 +75,7 @@ predicate isStringCopyUsedInLogicalOperationOrCondition(FunctionCall func, Expr
         func = ce.getCondition()
       )
     ) and
-    msg = "Return value of " + func.getTarget().getQualifiedName() +
+    msg = "Return value of " + func.getTarget().getName() +
         " used directly in a conditional expression."
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,12 @@ predicate isBoolean(Expr e1) {`
`36`	`36`	`predicate isStringCopyCastedAsBoolean(FunctionCall func, Expr expr1, string msg) {`
`37`	`37`	`DataFlow::localFlow(DataFlow::exprNode(func), DataFlow::exprNode(expr1)) and`
`38`	`38`	`isBoolean(expr1.getConversion*()) and`
`39`		`- isStringComparisonFunction(func.getTarget().getQualifiedName()) and`
`40`		`- msg = "Return value of " + func.getTarget().getQualifiedName() + " used as Boolean."`
	`39`	`+ isStringComparisonFunction(func.getTarget().getName()) and`
	`40`	`+ msg = "Return value of " + func.getTarget().getName() + " used as Boolean."`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`predicate isStringCopyUsedInLogicalOperationOrCondition(FunctionCall func, Expr expr1, string msg) {`
`44`		`- isStringComparisonFunction(func.getTarget().getQualifiedName()) and`
	`44`	`+ isStringComparisonFunction(func.getTarget().getName()) and`
`45`	`45`	`(`
`46`	`46`	`(`
`47`	`47`	`// it is being used in an equality or logical operation`
`@@ -60,7 +60,7 @@ predicate isStringCopyUsedInLogicalOperationOrCondition(FunctionCall func, Expr`
`60`	`60`	`func = ble.getAnOperand()`
`61`	`61`	`)`
`62`	`62`	`) and`
`63`		`- msg = "Return value of " + func.getTarget().getQualifiedName() +`
	`63`	`+ msg = "Return value of " + func.getTarget().getName() +`
`64`	`64`	`" used in a logical operation."`
`65`	`65`	`or`
`66`	`66`	`// or the string copy function is used directly as the conditional expression`
`@@ -75,7 +75,7 @@ predicate isStringCopyUsedInLogicalOperationOrCondition(FunctionCall func, Expr`
`75`	`75`	`func = ce.getCondition()`
`76`	`76`	`)`
`77`	`77`	`) and`
`78`		`- msg = "Return value of " + func.getTarget().getQualifiedName() +`
	`78`	`+ msg = "Return value of " + func.getTarget().getName() +`
`79`	`79`	`" used directly in a conditional expression."`
`80`	`80`	`)`
`81`	`81`	`}`