CPP: Fix issue.

geoffw0 · geoffw0 · commit 3ccbeb0c65e7 · 2018-10-29T16:34:57.000Z
diff --git a/cpp/ql/src/Best Practices/Likely Errors/EmptyBlock.ql b/cpp/ql/src/Best Practices/Likely Errors/EmptyBlock.ql
@@ -78,7 +78,20 @@ predicate emptyBlockContainsNonchild(Block b) {
   )
 }
 
+predicate lineComment(Block b) {
+  exists(File f, int line |
+    f = b.getFile() and
+    line = b.getLocation().getStartLine() and
+    line = b.getLocation().getEndLine() and
+    exists(Comment c |
+      c.getFile() = f and
+      c.getLocation().getStartLine() = line
+    )
+  )
+}
+
 from ControlStructure s, Block eb
 where emptyBlock(s, eb)
   and not emptyBlockContainsNonchild(eb)
+  and not lineComment(eb)
 select eb, "Empty block without comment"
diff --git a/cpp/ql/test/query-tests/Best Practices/Likely Errors/EmptyBlock/EmptyBlock.expected b/cpp/ql/test/query-tests/Best Practices/Likely Errors/EmptyBlock/EmptyBlock.expected
@@ -1,5 +1,3 @@
 | empty_block.cpp:7:10:7:11 | { ... } | Empty block without comment |
 | empty_block.cpp:10:10:11:3 | { ... } | Empty block without comment |
 | empty_block.cpp:18:10:19:3 | { ... } | Empty block without comment |
-| empty_block.cpp:53:10:53:11 | { ... } | Empty block without comment |
-| empty_block.cpp:56:10:56:11 | { ... } | Empty block without comment |
