Fix next-normal-statement predicate

2026-04-26 17:25:19 +02:00 · 2024-03-22 15:42:16 +00:00
parent bc0724e2b3
commit f66811048d
1 changed files with 3 additions and 4 deletions
--- a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
+++ b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -781,10 +781,9 @@ private module ControlFlowGraphImpl {
      getSwitchStatement(switch, i) = pred and
      getSwitchStatement(switch, i + 1) = immediateSucc and
      (
-        succ = immediateSucc and
-        not immediateSucc instanceof PatternCase
-        or
-        isNextNormalSwitchStmt(switch, immediateSucc, succ)
+        if immediateSucc instanceof PatternCase
+        then isNextNormalSwitchStmt(switch, immediateSucc, succ)
+        else succ = immediateSucc
      )
    )
  }