CPP: Have reachability flow to the Handler as well as the CAtchBlock of an exception.

geoffw0 · geoffw0 · commit 1092cb97e505 · 2018-10-30T14:27:22.000Z
diff --git a/cpp/ql/src/semmle/code/cpp/controlflow/BasicBlocks.qll b/cpp/ql/src/semmle/code/cpp/controlflow/BasicBlocks.qll
@@ -245,8 +245,14 @@ class BasicBlock extends ControlFlowNodeBase {
   predicate isReachable() {
     exists(Function f | f.getBlock() = this)
     or
-    exists(TryStmt t, BasicBlock tryblock | this = t.getACatchClause() and tryblock.isReachable() and tryblock.contains(t))
-    or
+    exists(TryStmt t, BasicBlock tryblock |
+      (
+        this = t.getACatchClause() or
+        this.(Handler).getTryStmt() = t
+      ) and
+      tryblock.isReachable() and
+      tryblock.contains(t)
+    ) or
     exists(BasicBlock pred | pred.getASuccessor() = this and pred.isReachable())
   }
 
diff --git a/cpp/ql/test/library-tests/c++_exceptions/unreachable.expected b/cpp/ql/test/library-tests/c++_exceptions/unreachable.expected
@@ -1,8 +1,2 @@
-| ODASA-5692.cpp:11:18:13:3 | <handler> |
-| ODASA-5692.cpp:11:18:13:3 | <handler> |
-| ODASA-5692.cpp:14:15:15:12 | <handler> |
-| ODASA-5692.cpp:14:15:15:12 | <handler> |
 | exceptions.cpp:25:13:30:9 | ExprStmt |
 | exceptions.cpp:26:13:26:13 | ExprStmt |
-| exceptions.cpp:32:19:34:5 | <handler> |
-| exceptions.cpp:35:19:37:5 | <handler> |
