C++: Address review comments

github · Nov 18, 2024 · 88be4b8 · 88be4b8
1 parent 2068591
commit 88be4b8
Showing 1 changed file with 3 additions and 0 deletions.
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