CPP: Fix query.

geoffw0 · geoffw0 · commit 48a60651b6aa · 2019-07-17T11:43:05.000+01:00
diff --git a/cpp/ql/src/Likely Bugs/Arithmetic/BitwiseSignCheck.ql b/cpp/ql/src/Likely Bugs/Arithmetic/BitwiseSignCheck.ql
@@ -12,9 +12,9 @@
 import cpp
 
 from RelationalOperation e, BinaryBitwiseOperation lhs
-where lhs = e.getLeftOperand() and
+where lhs = e.getGreaterOperand() and
       lhs.getActualType().(IntegralType).isSigned() and
       forall(int op | op = lhs.(BitwiseAndExpr).getAnOperand().getValue().toInt() | op < 0) and
-      e.getRightOperand().getValue() = "0" and
+      e.getLesserOperand().getValue() = "0" and
       not e.isAffectedByMacro()
 select e, "Potential unsafe sign check of a bitwise operation."
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/BitwiseSignCheck/BitwiseSignCheck.expected b/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/BitwiseSignCheck/BitwiseSignCheck.expected
@@ -2,4 +2,4 @@
 | bsc.cpp:6:10:6:32 | ... > ... | Potential unsafe sign check of a bitwise operation. |
 | bsc.cpp:10:10:10:33 | ... >= ... | Potential unsafe sign check of a bitwise operation. |
 | bsc.cpp:18:10:18:28 | ... > ... | Potential unsafe sign check of a bitwise operation. |
-| bsc.cpp:30:10:30:20 | ... < ... | Potential unsafe sign check of a bitwise operation. |
+| bsc.cpp:22:10:22:28 | ... < ... | Potential unsafe sign check of a bitwise operation. |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/BitwiseSignCheck/bsc.cpp b/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/BitwiseSignCheck/bsc.cpp
@@ -19,13 +19,13 @@ bool is_bit31_set_bad_v1(int x) {
 }
 
 bool is_bit31_set_bad_v2(int x) {
-  return 0 < (x & (1 << 31)); // BAD [NOT DETECTED]
+  return 0 < (x & (1 << 31)); // BAD
 }
 
 bool is_bit31_set_good(int x) {
   return (x & (1 << 31)) != 0; // GOOD (uses `!=`)
 }
 
 bool deliberately_checking_sign(int x, int y) {
-  return (x & y) < 0; // GOOD (use of `<` implies the sign check is intended) [FALSE POSITIVE]
+  return (x & y) < 0; // GOOD (use of `<` implies the sign check is intended)
 }

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,13 @@ bool is_bit31_set_bad_v1(int x) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`bool is_bit31_set_bad_v2(int x) {`
`22`		`- return 0 < (x & (1 << 31)); // BAD [NOT DETECTED]`
	`22`	`+ return 0 < (x & (1 << 31)); // BAD`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`bool is_bit31_set_good(int x) {`
`26`	`26`	return (x & (1 << 31)) != 0; // GOOD (uses `!=`)
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`bool deliberately_checking_sign(int x, int y) {`
`30`		- return (x & y) < 0; // GOOD (use of `<` implies the sign check is intended) [FALSE POSITIVE]
	`30`	+ return (x & y) < 0; // GOOD (use of `<` implies the sign check is intended)
`31`	`31`	`}`