fix ql/could-be-cast

erik-krogh · erik-krogh · commit b9823cf3357f · 2022-08-17T13:33:31.000+02:00
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-125/DangerousWorksWithMultibyteOrWideCharacters.ql b/cpp/ql/src/experimental/Security/CWE/CWE-125/DangerousWorksWithMultibyteOrWideCharacters.ql
@@ -67,7 +67,7 @@ predicate findUseCharacterConversion(Expr exp, string msg) {
   exists(FunctionCall fc |
     fc = exp and
     (
-      exists(Loop lptmp | lptmp = fc.getEnclosingStmt().getParentStmt*()) and
+      fc.getEnclosingStmt().getParentStmt*() instanceof Loop and
       fc.getTarget().hasName(["mbtowc", "mbrtowc", "_mbtowc_l"]) and
       not fc.getArgument(0).isConstant() and
       not fc.getArgument(1).isConstant() and
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.ql b/cpp/ql/src/experimental/Security/CWE/CWE-190/DangerousUseOfTransformationAfterOperation.ql
@@ -75,7 +75,7 @@ predicate signSmallerWithEqualSizes(MulExpr mexp) {
       ae.getRValue().getUnderlyingType().(IntegralType).isUnsigned() and
       ae.getLValue().getUnderlyingType().(IntegralType).isSigned() and
       (
-        not exists(DivExpr de | mexp.getParent*() = de)
+        not mexp.getParent*() instanceof DivExpr
         or
         exists(DivExpr de, Expr ec |
           e2.isConstant() and

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ predicate findUseCharacterConversion(Expr exp, string msg) {`
`67`	`67`	`exists(FunctionCall fc \|`
`68`	`68`	`fc = exp and`
`69`	`69`	`(`
`70`		`- exists(Loop lptmp \| lptmp = fc.getEnclosingStmt().getParentStmt*()) and`
	`70`	`+ fc.getEnclosingStmt().getParentStmt*() instanceof Loop and`
`71`	`71`	`fc.getTarget().hasName(["mbtowc", "mbrtowc", "_mbtowc_l"]) and`
`72`	`72`	`not fc.getArgument(0).isConstant() and`
`73`	`73`	`not fc.getArgument(1).isConstant() and`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ predicate signSmallerWithEqualSizes(MulExpr mexp) {`
`75`	`75`	`ae.getRValue().getUnderlyingType().(IntegralType).isUnsigned() and`
`76`	`76`	`ae.getLValue().getUnderlyingType().(IntegralType).isSigned() and`
`77`	`77`	`(`
`78`		`- not exists(DivExpr de \| mexp.getParent*() = de)`
	`78`	`+ not mexp.getParent*() instanceof DivExpr`
`79`	`79`	`or`
`80`	`80`	`exists(DivExpr de, Expr ec \|`
`81`	`81`	`e2.isConstant() and`