Merge pull request #20091 from aschackmull/java/fix-cfg-cp-assert

Java: Fix accidental CP in CFG for asserts.
2026-04-27 01:35:13 +02:00 · 2025-07-21 09:07:19 +02:00
parent d64a9368d2 bc2e7d4e0d
commit 937e3dc469
1 changed files with 2 additions and 1 deletions
--- a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
+++ b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -1621,7 +1621,8 @@ private module ControlFlowGraphImpl {
        result.(AssertThrowNode).getAstNode() = assertstmt
      )
      or
-      last(assertstmt.getMessage(), n, NormalCompletion()) and
+      last(assertstmt.getMessage(), n, completion) and
+      completion = NormalCompletion() and
      result.(AssertThrowNode).getAstNode() = assertstmt
    )
    or