C++: Address review comments

jketema · jketema · commit 88be4b88ab61 · 2024-11-18T14:27:01.000+01:00
diff --git a/cpp/ql/src/experimental/Best Practices/GuardedFree.ql b/cpp/ql/src/experimental/Best Practices/GuardedFree.ql
@@ -22,6 +22,7 @@ predicate blockContainsPreprocessorBranches(BasicBlock bb) {
   exists(PreprocessorBranch ppb, Location bbLoc, Location ppbLoc |
     bbLoc = bb.(Stmt).getLocation() and ppbLoc = ppb.getLocation()
   |
+    bbLoc.getFile() = ppb.getFile() and
     bbLoc.getStartLine() < ppbLoc.getStartLine() and
     ppbLoc.getEndLine() < bbLoc.getEndLine()
   )
@@ -33,8 +34,10 @@ where
   fc.getArgument(0) = v.getAnAccess() and
   bb = fc.getBasicBlock() and
   (
+    // No block statement: if (x) free(x);
     bb = fc.getEnclosingStmt()
     or
+    // Block statement with a single nested statement: if (x) { free(x); }
     strictcount(bb.(BlockStmt).getAStmt()) = 1
   ) and
   strictcount(BasicBlock bb2 | gc.ensuresEq(_, 0, bb2, _) | bb2) = 1 and

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ predicate blockContainsPreprocessorBranches(BasicBlock bb) {`
`22`	`22`	`exists(PreprocessorBranch ppb, Location bbLoc, Location ppbLoc \|`
`23`	`23`	`bbLoc = bb.(Stmt).getLocation() and ppbLoc = ppb.getLocation()`
`24`	`24`	`\|`
	`25`	`+ bbLoc.getFile() = ppb.getFile() and`
`25`	`26`	`bbLoc.getStartLine() < ppbLoc.getStartLine() and`
`26`	`27`	`ppbLoc.getEndLine() < bbLoc.getEndLine()`
`27`	`28`	`)`
`@@ -33,8 +34,10 @@ where`
`33`	`34`	`fc.getArgument(0) = v.getAnAccess() and`
`34`	`35`	`bb = fc.getBasicBlock() and`
`35`	`36`	`(`
	`37`	`+ // No block statement: if (x) free(x);`
`36`	`38`	`bb = fc.getEnclosingStmt()`
`37`	`39`	`or`
	`40`	`+ // Block statement with a single nested statement: if (x) { free(x); }`
`38`	`41`	`strictcount(bb.(BlockStmt).getAStmt()) = 1`
`39`	`42`	`) and`
`40`	`43`	`strictcount(BasicBlock bb2 \| gc.ensuresEq(_, 0, bb2, _) \| bb2) = 1 and`