Comments taken into account

catenacyber · catenacyber · commit d2763e8149e1 · 2020-07-09T16:05:24.000+02:00
diff --git a/cpp/ql/src/Likely Bugs/RedundantNullCheckParam.cpp b/cpp/ql/src/Likely Bugs/RedundantNullCheckParam.cpp
@@ -1,11 +1,11 @@
 void test(char *arg1, int *arg2) {
     if (arg1[0] == 'A') {
-        if (arg2 != NULL) {
+        if (arg2 != NULL) { //maybe redundant
             *arg2 = 42;
         }
     }
     if (arg1[1] == 'B')
     {
-        *arg2 = 54;
+        *arg2 = 54; //dereferenced without checking first
     }
 }
diff --git a/cpp/ql/src/Likely Bugs/RedundantNullCheckParam.ql b/cpp/ql/src/Likely Bugs/RedundantNullCheckParam.ql
@@ -13,19 +13,14 @@
 
 import cpp
 
-predicate blockDominates(Block check, Block access) {
-  check.getLocation().getStartLine() <= access.getLocation().getStartLine() and
-  check.getLocation().getEndLine() >= access.getLocation().getEndLine()
-}
-
 predicate isCheckedInstruction(VariableAccess unchecked, VariableAccess checked) {
   checked =
     any(VariableAccess va |
       va.getTarget() = unchecked.getTarget()
   ) and
 //Simple test if the first access in this code path is dereferenced
   not dereferenced(checked) and
-  blockDominates(checked.getEnclosingBlock(), unchecked.getEnclosingBlock())
+  bbDominates(checked.getBasicBlock(), unchecked.getBasicBlock())
 }
 
 predicate candidateResultUnchecked(VariableAccess unchecked) {

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`void test(char arg1, int arg2) {`
`2`	`2`	`if (arg1[0] == 'A') {`
`3`		`- if (arg2 != NULL) {`
	`3`	`+ if (arg2 != NULL) { //maybe redundant`
`4`	`4`	`*arg2 = 42;`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`	`if (arg1[1] == 'B')`
`8`	`8`	`{`
`9`		`- *arg2 = 54;`
	`9`	`+ *arg2 = 54; //dereferenced without checking first`
`10`	`10`	`}`
`11`	`11`	`}`