C++: Correct UnsignedBitwiseAndExpr.

Author: geoffw0

cpp/ql/src/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll

@@ -125,11 +125,11 @@ private string getValue(Expr e) {
 private class UnsignedBitwiseAndExpr extends BitwiseAndExpr {
   UnsignedBitwiseAndExpr() {
     (
-      getLeftOperand().getType().getUnderlyingType().(IntegralType).isUnsigned() or
+      getLeftOperand().getFullyConverted().getType().getUnderlyingType().(IntegralType).isUnsigned() or
       getLeftOperand().getValue().toInt() >= 0
     ) and
     (
-      getRightOperand().getType().getUnderlyingType().(IntegralType).isUnsigned() or
+      getRightOperand().getFullyConverted().getType().getUnderlyingType().(IntegralType).isUnsigned() or
       getRightOperand().getValue().toInt() >= 0
     )
   }

cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/ComparisonWithWiderType/ComparisonWithWiderType.expected

@@ -13,4 +13,3 @@
 | test.c:107:14:107:26 | ... < ... | Comparison between $@ of type unsigned char and $@ of wider type unsigned int. | test.c:83:16:83:16 | c | c | test.c:107:19:107:25 | ... >> ... | ... >> ... |
 | test.c:128:15:128:21 | ... < ... | Comparison between $@ of type unsigned char and $@ of wider type unsigned int. | test.c:121:16:121:17 | uc | uc | test.c:123:19:123:20 | sz | sz |
 | test.c:139:15:139:21 | ... < ... | Comparison between $@ of type unsigned char and $@ of wider type unsigned int. | test.c:121:16:121:17 | uc | uc | test.c:123:19:123:20 | sz | sz |
-| test.c:146:15:146:21 | ... < ... | Comparison between $@ of type unsigned char and $@ of wider type unsigned int. | test.c:121:16:121:17 | uc | uc | test.c:123:19:123:20 | sz | sz |

cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/ComparisonWithWiderType/test.c

@@ -143,5 +143,5 @@ void test13() {
 	if (sx < 0) {sx = 0;}
 	if (sx > 128) {sx = 128;}
 	sz = (unsigned)sx & (unsigned)sy;
-	for (uc = 0; uc < sz; uc++) {} // GOOD [FALSE POSITIVE]
+	for (uc = 0; uc < sz; uc++) {} // GOOD
 }