Merge pull request #16115 from hvitved/dataflow/fix-bad-join

Data flow: Fix bad join
github · Apr 4, 2024 · c03b745 · c03b745
2 parents c2f91a5 + 79440f6
commit c03b745
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -460,12 +460,15 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       stepFilter(node1, node2)
     }
 
+    pragma[nomagic]
+    private predicate hasReadStep(Content c) { read(_, c, _) }
+
     pragma[nomagic]
     private predicate storeEx(
       NodeEx node1, Content c, NodeEx node2, DataFlowType contentType, DataFlowType containerType
     ) {
       storeExUnrestricted(node1, c, node2, contentType, containerType) and
-      read(_, c, _)
+      hasReadStep(c)
     }
 
     pragma[nomagic]