Merge pull request github#9726 from github/rdmarsh2/stack-address-join-order

jketema · web-flow · commit 8b13d1fab8da · 2022-06-29T09:35:47.000+02:00
C++: fix join order in UsingExpiredStackAddress
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql b/cpp/ql/src/Likely Bugs/Memory Management/UsingExpiredStackAddress.ql
@@ -133,7 +133,9 @@ TGlobalAddress globalAddress(Instruction instr) {
   )
   or
   exists(FieldAddressInstruction fai | instr = fai |
-    result = TFieldAddress(globalAddress(fai.getObjectAddress()), fai.getField())
+    result =
+      TFieldAddress(globalAddress(pragma[only_bind_into](fai.getObjectAddress())),
+        pragma[only_bind_out](fai.getField()))
   )
   or
   result = globalAddress(instr.(PointerOffsetInstruction).getLeft())

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,9 @@ TGlobalAddress globalAddress(Instruction instr) {`
`133`	`133`	`)`
`134`	`134`	`or`
`135`	`135`	`exists(FieldAddressInstruction fai \| instr = fai \|`
`136`		`- result = TFieldAddress(globalAddress(fai.getObjectAddress()), fai.getField())`
	`136`	`+ result =`
	`137`	`+ TFieldAddress(globalAddress(pragma[only_bind_into](fai.getObjectAddress())),`
	`138`	`+ pragma[only_bind_out](fai.getField()))`
`137`	`139`	`)`
`138`	`140`	`or`
`139`	`141`	`result = globalAddress(instr.(PointerOffsetInstruction).getLeft())`