C#/Ruby/Rust: Fix bug in adjacentReadPairSameVar.

aschackmull · aschackmull · commit ed40035b9cb9 · 2025-02-19T16:20:57.000+01:00
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll
@@ -949,7 +949,7 @@ private module Cached {
   predicate adjacentReadPairSameVar(Definition def, ControlFlow::Node cfn1, ControlFlow::Node cfn2) {
     exists(ControlFlow::BasicBlock bb1, int i1, ControlFlow::BasicBlock bb2, int i2 |
       cfn1 = bb1.getNode(i1) and
-      variableReadActual(bb1, i1, _) and
+      variableReadActual(bb1, i1, def.getSourceVariable()) and
       adjacentDefSkipUncertainReads(def, bb1, i1, bb2, i2) and
       cfn2 = bb2.getNode(i2)
     )
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
@@ -409,7 +409,7 @@ private module Cached {
   ) {
     exists(Cfg::BasicBlock bb1, int i1, Cfg::BasicBlock bb2, int i2 |
       read1 = bb1.getNode(i1) and
-      variableReadActual(bb1, i1, _) and
+      variableReadActual(bb1, i1, def.getSourceVariable()) and
       adjacentDefSkipUncertainReads(def, bb1, i1, bb2, i2) and
       read2 = bb2.getNode(i2)
     )
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
@@ -330,7 +330,7 @@ private module Cached {
   predicate adjacentReadPair(Definition def, CfgNode read1, CfgNode read2) {
     exists(BasicBlock bb1, int i1, BasicBlock bb2, int i2 |
       read1 = bb1.getNode(i1) and
-      variableReadActual(bb1, i1, _) and
+      variableReadActual(bb1, i1, def.getSourceVariable()) and
       adjacentDefSkipUncertainReads(def, bb1, i1, bb2, i2) and
       read2 = bb2.getNode(i2)
     )

Original file line number	Diff line number	Diff line change
`@@ -949,7 +949,7 @@ private module Cached {`
`949`	`949`	`predicate adjacentReadPairSameVar(Definition def, ControlFlow::Node cfn1, ControlFlow::Node cfn2) {`
`950`	`950`	`exists(ControlFlow::BasicBlock bb1, int i1, ControlFlow::BasicBlock bb2, int i2 \|`
`951`	`951`	`cfn1 = bb1.getNode(i1) and`
`952`		`- variableReadActual(bb1, i1, _) and`
	`952`	`+ variableReadActual(bb1, i1, def.getSourceVariable()) and`
`953`	`953`	`adjacentDefSkipUncertainReads(def, bb1, i1, bb2, i2) and`
`954`	`954`	`cfn2 = bb2.getNode(i2)`
`955`	`955`	`)`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ private module Cached {`
`409`	`409`	`) {`
`410`	`410`	`exists(Cfg::BasicBlock bb1, int i1, Cfg::BasicBlock bb2, int i2 \|`
`411`	`411`	`read1 = bb1.getNode(i1) and`
`412`		`- variableReadActual(bb1, i1, _) and`
	`412`	`+ variableReadActual(bb1, i1, def.getSourceVariable()) and`
`413`	`413`	`adjacentDefSkipUncertainReads(def, bb1, i1, bb2, i2) and`
`414`	`414`	`read2 = bb2.getNode(i2)`
`415`	`415`	`)`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ private module Cached {`
`330`	`330`	`predicate adjacentReadPair(Definition def, CfgNode read1, CfgNode read2) {`
`331`	`331`	`exists(BasicBlock bb1, int i1, BasicBlock bb2, int i2 \|`
`332`	`332`	`read1 = bb1.getNode(i1) and`
`333`		`- variableReadActual(bb1, i1, _) and`
	`333`	`+ variableReadActual(bb1, i1, def.getSourceVariable()) and`
`334`	`334`	`adjacentDefSkipUncertainReads(def, bb1, i1, bb2, i2) and`
`335`	`335`	`read2 = bb2.getNode(i2)`
`336`	`336`	`)`