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

aschackmull · web-flow · commit 937e3dc469a9 · 2025-07-21T09:07:19.000+02:00
Java: Fix accidental CP in CFG for asserts.
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1621,7 +1621,8 @@ private module ControlFlowGraphImpl {`
`1621`	`1621`	`result.(AssertThrowNode).getAstNode() = assertstmt`
`1622`	`1622`	`)`
`1623`	`1623`	`or`
`1624`		`- last(assertstmt.getMessage(), n, NormalCompletion()) and`
	`1624`	`+ last(assertstmt.getMessage(), n, completion) and`
	`1625`	`+ completion = NormalCompletion() and`
`1625`	`1626`	`result.(AssertThrowNode).getAstNode() = assertstmt`
`1626`	`1627`	`)`
`1627`	`1628`	`or`