CPP: Fix for explicitly cast expressions.

Author: geoffw0

cpp/ql/src/jsf/4.21 Operators/AV Rule 164.ql

@@ -35,7 +35,7 @@ predicate constantValue(Expr e, int value) {
 predicate violation(BinaryBitwiseOperation op, int lhsBytes, int value) {
     (op instanceof LShiftExpr or op instanceof RShiftExpr) and
     constantValue(op.getRightOperand(), value) and
-    lhsBytes = op.getLeftOperand().getType().getSize() and
+    lhsBytes = op.getLeftOperand().getExplicitlyConverted().getType().getSize() and
     (value < 0 or value >= lhsBytes * 8)
 }
 

cpp/ql/test/query-tests/jsf/4.21 Operators/AV Rule 164/AV Rule 164.expected

@@ -4,4 +4,5 @@
 | test.c:11:2:11:8 | ... << ... | AV Rule 164: The right-hand operand (here a value is 8) of this shift shall lie between 0 and 7. |
 | test.c:18:2:18:9 | ... >> ... | AV Rule 164: The right-hand operand (here a value is -1) of this shift shall lie between 0 and 7. |
 | test.c:21:2:21:8 | ... >> ... | AV Rule 164: The right-hand operand (here a value is 8) of this shift shall lie between 0 and 7. |
-| test.c:23:2:23:25 | ... >> ... | AV Rule 164: The right-hand operand (here a value is -1) of this shift shall lie between 0 and 31. |
+| test.c:23:2:23:25 | ... >> ... | AV Rule 164: The right-hand operand (here a value is -1) of this shift shall lie between 0 and 7. |
+| test.c:26:2:26:24 | ... >> ... | AV Rule 164: The right-hand operand (here a value is 8) of this shift shall lie between 0 and 7. |

cpp/ql/test/query-tests/jsf/4.21 Operators/AV Rule 164/test.c

@@ -23,6 +23,6 @@ void f(unsigned char uc, signed char sc, int i) {
 	((unsigned char)i) >> -1; // BAD
 	((unsigned char)i) >> 0;
 	((unsigned char)i) >> 7;
-	((unsigned char)i) >> 8; // BAD [NOT DETECTED]
+	((unsigned char)i) >> 8; // BAD
 }