C++: Fix false positive

MathiasVP · MathiasVP · commit 9a841636dca1 · 2020-01-07T13:22:07.000+01:00
diff --git a/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.ql b/cpp/ql/src/Likely Bugs/Likely Typos/AssignWhereCompareMeant.ql
@@ -65,7 +65,8 @@ class BooleanControllingAssignmentInStmt extends BooleanControllingAssignment {
  */
 predicate candidateResult(BooleanControllingAssignment ae) {
   ae.getRValue().isConstant() and
-  not ae.isWhitelisted()
+  not ae.isWhitelisted() and
+  not ae.getRValue() instanceof StringLiteral
 }
 
 /**
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AssignWhereCompareMeant/AssignWhereCompareMeant.expected b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AssignWhereCompareMeant/AssignWhereCompareMeant.expected
@@ -14,4 +14,3 @@
 | test.cpp:84:7:84:11 | ... = ... | Use of '=' where '==' may have been intended. |
 | test.cpp:92:17:92:22 | ... = ... | Use of '=' where '==' may have been intended. |
 | test.cpp:113:6:113:10 | ... = ... | Use of '=' where '==' may have been intended. |
-| test.cpp:124:6:124:15 | ... = ... | Use of '=' where '==' may have been intended. |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AssignWhereCompareMeant/test.cpp b/cpp/ql/test/query-tests/Likely Bugs/Likely Typos/AssignWhereCompareMeant/test.cpp
@@ -121,6 +121,6 @@ void f() {
 void f2() {
   const char* sz = "abc";
 
-  if(sz = "def") { // GOOD [FALSE POSITIVE]: a == comparison with a string literal is probably not the intent here
+  if(sz = "def") { // GOOD: a == comparison with a string literal is probably not the intent here
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ class BooleanControllingAssignmentInStmt extends BooleanControllingAssignment {`
`65`	`65`	`*/`
`66`	`66`	`predicate candidateResult(BooleanControllingAssignment ae) {`
`67`	`67`	`ae.getRValue().isConstant() and`
`68`		`- not ae.isWhitelisted()`
	`68`	`+ not ae.isWhitelisted() and`
	`69`	`+ not ae.getRValue() instanceof StringLiteral`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,6 @@ void f() {`
`121`	`121`	`void f2() {`
`122`	`122`	`const char* sz = "abc";`
`123`	`123`
`124`		`- if(sz = "def") { // GOOD [FALSE POSITIVE]: a == comparison with a string literal is probably not the intent here`
	`124`	`+ if(sz = "def") { // GOOD: a == comparison with a string literal is probably not the intent here`
`125`	`125`	`}`
`126`	`126`	`}`