Java: Fix bad join-order.

aschackmull · aschackmull · commit 9ba169b3465e · 2020-01-06T16:52:06.000+01:00
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =
       flow(p, true, TNil(_), conf) and
       parameterFlowReturn(p, ret, _, _, _,
         any(Summary s | s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   } or
   TSummaryCtxConsNil(ParameterNode p, Content f) {
     exists(Configuration conf, ReturnNodeExt ret |
       flow(p, true, TConsNil(f, _), conf) and
       parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and
-      flow(ret, conf)
+      flow(ret, unbind(conf))
     )
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1805,14 +1805,14 @@ private newtype TSummaryCtx =`
`1805`	`1805`	`flow(p, true, TNil(_), conf) and`
`1806`	`1806`	`parameterFlowReturn(p, ret, _, _, _,`
`1807`	`1807`	`any(Summary s \| s = TSummaryTaint() or s = TSummaryTaintStore(_)), conf) and`
`1808`		`- flow(ret, conf)`
	`1808`	`+ flow(ret, unbind(conf))`
`1809`	`1809`	`)`
`1810`	`1810`	`} or`
`1811`	`1811`	`TSummaryCtxConsNil(ParameterNode p, Content f) {`
`1812`	`1812`	`exists(Configuration conf, ReturnNodeExt ret \|`
`1813`	`1813`	`flow(p, true, TConsNil(f, _), conf) and`
`1814`	`1814`	`parameterFlowReturn(p, ret, _, _, _, TSummaryReadTaint(f), conf) and`
`1815`		`- flow(ret, conf)`
	`1815`	`+ flow(ret, unbind(conf))`
`1816`	`1816`	`)`
`1817`	`1817`	`}`
`1818`	`1818`