Merge pull request #12007 from MathiasVP/fix-is-chi-before-iterator-use

MathiasVP · web-flow · commit 22202afbf556 · 2023-01-30T14:01:39.000Z
C++: Add missing condition to `isChiBeforeIteratorUse`
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternalsCommon.qll
@@ -538,6 +538,7 @@ private module Cached {
       numberOfLoads >= 0 and
       isUse(_, iteratorDerefAddress, iteratorBase, numberOfLoads + 2, 0) and
       iteratorBase.getResultType() instanceof Interfaces::Iterator and
+      load.getSourceAddressOperand() = iteratorDerefAddress and
       read.getPrimaryInstruction() = load.getSourceAddress() and
       memory = read.getSideEffectOperand().getAnyDef()
     )

Original file line number	Diff line number	Diff line change
`@@ -538,6 +538,7 @@ private module Cached {`
`538`	`538`	`numberOfLoads >= 0 and`
`539`	`539`	`isUse(_, iteratorDerefAddress, iteratorBase, numberOfLoads + 2, 0) and`
`540`	`540`	`iteratorBase.getResultType() instanceof Interfaces::Iterator and`
	`541`	`+ load.getSourceAddressOperand() = iteratorDerefAddress and`
`541`	`542`	`read.getPrimaryInstruction() = load.getSourceAddress() and`
`542`	`543`	`memory = read.getSideEffectOperand().getAnyDef()`
`543`	`544`	`)`