Merge pull request github#18644 from hvitved/rust/fix-bad-join

hvitved · web-flow · commit 1066b880aaf0 · 2025-02-03T10:16:09.000+01:00
Rust: Fix a bad join
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
@@ -284,7 +284,7 @@ private predicate isControlFlowJump(Expr e) { e instanceof CallExprBase or e ins
 private predicate capturedCallRead(Expr call, BasicBlock bb, int i, Variable v) {
   isControlFlowJump(call) and
   exists(Cfg::CfgScope scope |
-    hasCapturedRead(v, scope) and
+    hasCapturedRead(pragma[only_bind_into](v), pragma[only_bind_into](scope)) and
     (
       variableWriteInOuterScope(bb, any(int j | j < i), v, scope) or
       variableWriteInOuterScope(bb.getAPredecessor+(), _, v, scope)

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ private predicate isControlFlowJump(Expr e) { e instanceof CallExprBase or e ins`
`284`	`284`	`private predicate capturedCallRead(Expr call, BasicBlock bb, int i, Variable v) {`
`285`	`285`	`isControlFlowJump(call) and`
`286`	`286`	`exists(Cfg::CfgScope scope \|`
`287`		`- hasCapturedRead(v, scope) and`
	`287`	`+ hasCapturedRead(pragma[only_bind_into](v), pragma[only_bind_into](scope)) and`
`288`	`288`	`(`
`289`	`289`	`variableWriteInOuterScope(bb, any(int j \| j < i), v, scope) or`
`290`	`290`	`variableWriteInOuterScope(bb.getAPredecessor+(), _, v, scope)`