Merge branch 'assign-where-compare-meant-false-positives' of github.com:MathiasVP/ql into assign-where-compare-meant-false-positives

MathiasVP · MathiasVP · commit 111f1dbd19be · 2020-01-10T13:14:00.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
@@ -55,7 +55,7 @@ class BooleanControllingAssignmentInExpr extends BooleanControllingAssignment {
     this.getConversion().(ParenthesisExpr).isParenthesised()
     or
     // whitelist this assignment if all comparison operations in the expression that this
-    // assignment is part of, are ot parenthesized. In that case it seems like programmer
+    // assignment is part of, are not parenthesized. In that case it seems like programmer
     // is fine with unparenthesized comparison operands to binary logical operators, and
     // the parenthesis around this assignment was used to call it out as an assignment.
     this.isParenthesised() and
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
@@ -102,7 +102,7 @@ void g(int *i_p, int cond) {
 template<typename>
 void h() {
   int x;
-  if(x = 0) { // GOOD: x is not initialized so this is probably intensional
+  if(x = 0) { // GOOD: x is not initialized so this is probably intentional
   }
 
   int y = 0;
@@ -152,4 +152,4 @@ void f3(int x, int y) {
 
   if((x == 10) || ((z == z) && (x == 1)) && (y = 2)) { // BAD
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ void g(int *i_p, int cond) {`
`102`	`102`	`template<typename>`
`103`	`103`	`void h() {`
`104`	`104`	`int x;`
`105`		`- if(x = 0) { // GOOD: x is not initialized so this is probably intensional`
	`105`	`+ if(x = 0) { // GOOD: x is not initialized so this is probably intentional`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`int y = 0;`
`@@ -152,4 +152,4 @@ void f3(int x, int y) {`
`152`	`152`
`153`	`153`	`if((x == 10) \|\| ((z == z) && (x == 1)) && (y = 2)) { // BAD`
`154`	`154`	`}`
`155`		`-}`
	`155`	`+}`