Data flow: Sync files

2026-05-01 03:35:13 +02:00 · 2020-03-18 13:28:26 +01:00
parent 321b91209f
commit 3bd6429072
18 changed files with 306 additions and 288 deletions
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
@@ -1430,7 +1430,7 @@ abstract private class AccessPathFront extends TAccessPathFront {

  abstract DataFlowType getType();

-  abstract boolean toBool();
+  abstract boolean toBoolNonEmpty();

  predicate headUsesContent(Content f) { this = TFrontHead(f) }
 }
@@ -1442,7 +1442,7 @@ private class AccessPathFrontNil extends AccessPathFront, TFrontNil {

  override DataFlowType getType() { this = TFrontNil(result) }

-  override boolean toBool() { result = false }
+  override boolean toBoolNonEmpty() { result = false }
 }

 private class AccessPathFrontHead extends AccessPathFront, TFrontHead {
@@ -1452,7 +1452,7 @@ private class AccessPathFrontHead extends AccessPathFront, TFrontHead {
    exists(Content head | this = TFrontHead(head) | result = head.getContainerType())
  }

-  override boolean toBool() { result = true }
+  override boolean toBoolNonEmpty() { result = true }
 }

 /**
@@ -1477,6 +1477,16 @@ private predicate flowCandFwd0(
  fromArg = false and
  apf = TFrontNil(node.getErasedNodeTypeBound())
  or
+  exists(NodeExt mid |
+    flowCandFwd(mid, fromArg, apf, config) and
+    localFlowBigStepExt(mid, node, true, _, config)
+  )
+  or
+  exists(NodeExt mid, AccessPathFrontNil nil |
+    flowCandFwd(mid, fromArg, nil, config) and
+    localFlowBigStepExt(mid, node, false, apf, config)
+  )
+  or
  nodeCand2(node, unbind(config)) and
  (
    exists(NodeExt mid |
@@ -1518,16 +1528,6 @@ private predicate flowCandFwd0(
    )
  )
  or
-  exists(NodeExt mid |
-    flowCandFwd(mid, fromArg, apf, config) and
-    localFlowBigStepExt(mid, node, true, _, config)
-  )
-  or
-  exists(NodeExt mid, AccessPathFrontNil nil |
-    flowCandFwd(mid, fromArg, nil, config) and
-    localFlowBigStepExt(mid, node, false, apf, config)
-  )
-  or
  exists(NodeExt mid, Content f |
    flowCandFwd(mid, fromArg, _, config) and
    storeExtCand2(mid, f, node, config) and
@@ -1538,7 +1538,7 @@ private predicate flowCandFwd0(
  exists(Content f |
    flowCandFwdRead(f, node, fromArg, config) and
    consCandFwd(f, apf, config) and
-    nodeCand2(node, _, unbindBool(apf.toBool()), unbind(config))
+    nodeCand2(node, _, unbindBool(apf.toBoolNonEmpty()), unbind(config))
  )
 }

@@ -1897,7 +1897,7 @@ private predicate flowFwdStore1(
  flowFwdStore0(mid, f, node, apf0, config) and
  consCand(f, apf0, config) and
  apf.headUsesContent(f) and
-  flowCand(node, _, apf, config)
+  flowCand(node, _, apf, unbind(config))
 }

 pragma[nomagic]
@@ -2025,7 +2025,8 @@ private predicate readFwd(
 ) {
  readExtCand2(node1, f, node2, config) and
  flowFwdRead(node2, f, ap, _, config) and
-  ap0 = pop(f, ap)
+  ap0 = pop(f, ap) and
+  flowConsCandFwd(f, _, ap0, unbind(config))
 }

 pragma[nomagic]
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -1430,7 +1430,7 @@ abstract private class AccessPathFront extends TAccessPathFront {

  abstract DataFlowType getType();

-  abstract boolean toBool();
+  abstract boolean toBoolNonEmpty();

  predicate headUsesContent(Content f) { this = TFrontHead(f) }
 }
@@ -1442,7 +1442,7 @@ private class AccessPathFrontNil extends AccessPathFront, TFrontNil {

  override DataFlowType getType() { this = TFrontNil(result) }

-  override boolean toBool() { result = false }
+  override boolean toBoolNonEmpty() { result = false }
 }

 private class AccessPathFrontHead extends AccessPathFront, TFrontHead {
@@ -1452,7 +1452,7 @@ private class AccessPathFrontHead extends AccessPathFront, TFrontHead {
    exists(Content head | this = TFrontHead(head) | result = head.getContainerType())
  }

-  override boolean toBool() { result = true }
+  override boolean toBoolNonEmpty() { result = true }
 }

 /**
@@ -1477,6 +1477,16 @@ private predicate flowCandFwd0(
  fromArg = false and
  apf = TFrontNil(node.getErasedNodeTypeBound())
  or
+  exists(NodeExt mid |
+    flowCandFwd(mid, fromArg, apf, config) and
+    localFlowBigStepExt(mid, node, true, _, config)
+  )
+  or
+  exists(NodeExt mid, AccessPathFrontNil nil |
+    flowCandFwd(mid, fromArg, nil, config) and
+    localFlowBigStepExt(mid, node, false, apf, config)
+  )
+  or
  nodeCand2(node, unbind(config)) and
  (
    exists(NodeExt mid |
@@ -1518,16 +1528,6 @@ private predicate flowCandFwd0(
    )
  )
  or
-  exists(NodeExt mid |
-    flowCandFwd(mid, fromArg, apf, config) and
-    localFlowBigStepExt(mid, node, true, _, config)
-  )
-  or
-  exists(NodeExt mid, AccessPathFrontNil nil |
-    flowCandFwd(mid, fromArg, nil, config) and
-    localFlowBigStepExt(mid, node, false, apf, config)
-  )
-  or
  exists(NodeExt mid, Content f |
    flowCandFwd(mid, fromArg, _, config) and
    storeExtCand2(mid, f, node, config) and
@@ -1538,7 +1538,7 @@ private predicate flowCandFwd0(
  exists(Content f |
    flowCandFwdRead(f, node, fromArg, config) and
    consCandFwd(f, apf, config) and
-    nodeCand2(node, _, unbindBool(apf.toBool()), unbind(config))
+    nodeCand2(node, _, unbindBool(apf.toBoolNonEmpty()), unbind(config))
  )
 }

@@ -1897,7 +1897,7 @@ private predicate flowFwdStore1(
  flowFwdStore0(mid, f, node, apf0, config) and
  consCand(f, apf0, config) and
  apf.headUsesContent(f) and
-  flowCand(node, _, apf, config)
+  flowCand(node, _, apf, unbind(config))
 }

 pragma[nomagic]
@@ -2025,7 +2025,8 @@ private predicate readFwd(
 ) {
  readExtCand2(node1, f, node2, config) and
  flowFwdRead(node2, f, ap, _, config) and
-  ap0 = pop(f, ap)
+  ap0 = pop(f, ap) and
+  flowConsCandFwd(f, _, ap0, unbind(config))
 }

 pragma[nomagic]
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -1430,7 +1430,7 @@ abstract private class AccessPathFront extends TAccessPathFront {

  abstract DataFlowType getType();

-  abstract boolean toBool();
+  abstract boolean toBoolNonEmpty();

  predicate headUsesContent(Content f) { this = TFrontHead(f) }
 }
@@ -1442,7 +1442,7 @@ private class AccessPathFrontNil extends AccessPathFront, TFrontNil {

  override DataFlowType getType() { this = TFrontNil(result) }

-  override boolean toBool() { result = false }
+  override boolean toBoolNonEmpty() { result = false }
 }

 private class AccessPathFrontHead extends AccessPathFront, TFrontHead {
@@ -1452,7 +1452,7 @@ private class AccessPathFrontHead extends AccessPathFront, TFrontHead {
    exists(Content head | this = TFrontHead(head) | result = head.getContainerType())
  }

-  override boolean toBool() { result = true }
+  override boolean toBoolNonEmpty() { result = true }
 }

 /**
@@ -1477,6 +1477,16 @@ private predicate flowCandFwd0(
  fromArg = false and
  apf = TFrontNil(node.getErasedNodeTypeBound())
  or
+  exists(NodeExt mid |
+    flowCandFwd(mid, fromArg, apf, config) and
+    localFlowBigStepExt(mid, node, true, _, config)
+  )
+  or
+  exists(NodeExt mid, AccessPathFrontNil nil |
+    flowCandFwd(mid, fromArg, nil, config) and
+    localFlowBigStepExt(mid, node, false, apf, config)
+  )
+  or
  nodeCand2(node, unbind(config)) and
  (
    exists(NodeExt mid |
@@ -1518,16 +1528,6 @@ private predicate flowCandFwd0(
    )
  )
  or
-  exists(NodeExt mid |
-    flowCandFwd(mid, fromArg, apf, config) and
-    localFlowBigStepExt(mid, node, true, _, config)
-  )
-  or
-  exists(NodeExt mid, AccessPathFrontNil nil |
-    flowCandFwd(mid, fromArg, nil, config) and
-    localFlowBigStepExt(mid, node, false, apf, config)
-  )
-  or
  exists(NodeExt mid, Content f |
    flowCandFwd(mid, fromArg, _, config) and
    storeExtCand2(mid, f, node, config) and
@@ -1538,7 +1538,7 @@ private predicate flowCandFwd0(
  exists(Content f |
    flowCandFwdRead(f, node, fromArg, config) and
    consCandFwd(f, apf, config) and
-    nodeCand2(node, _, unbindBool(apf.toBool()), unbind(config))
+    nodeCand2(node, _, unbindBool(apf.toBoolNonEmpty()), unbind(config))
  )
 }

@@ -1897,7 +1897,7 @@ private predicate flowFwdStore1(
  flowFwdStore0(mid, f, node, apf0, config) and
  consCand(f, apf0, config) and
  apf.headUsesContent(f) and
-  flowCand(node, _, apf, config)
+  flowCand(node, _, apf, unbind(config))
 }

 pragma[nomagic]
@@ -2025,7 +2025,8 @@ private predicate readFwd(
 ) {
  readExtCand2(node1, f, node2, config) and
  flowFwdRead(node2, f, ap, _, config) and
-  ap0 = pop(f, ap)
+  ap0 = pop(f, ap) and
+  flowConsCandFwd(f, _, ap0, unbind(config))
 }

 pragma[nomagic]
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -1430,7 +1430,7 @@ abstract private class AccessPathFront extends TAccessPathFront {

  abstract DataFlowType getType();

-  abstract boolean toBool();
+  abstract boolean toBoolNonEmpty();

  predicate headUsesContent(Content f) { this = TFrontHead(f) }
 }
@@ -1442,7 +1442,7 @@ private class AccessPathFrontNil extends AccessPathFront, TFrontNil {

  override DataFlowType getType() { this = TFrontNil(result) }

-  override boolean toBool() { result = false }
+  override boolean toBoolNonEmpty() { result = false }
 }

 private class AccessPathFrontHead extends AccessPathFront, TFrontHead {
@@ -1452,7 +1452,7 @@ private class AccessPathFrontHead extends AccessPathFront, TFrontHead {
    exists(Content head | this = TFrontHead(head) | result = head.getContainerType())
  }

-  override boolean toBool() { result = true }
+  override boolean toBoolNonEmpty() { result = true }
 }

 /**
@@ -1477,6 +1477,16 @@ private predicate flowCandFwd0(
  fromArg = false and
  apf = TFrontNil(node.getErasedNodeTypeBound())
  or
+  exists(NodeExt mid |
+    flowCandFwd(mid, fromArg, apf, config) and
+    localFlowBigStepExt(mid, node, true, _, config)
+  )
+  or
+  exists(NodeExt mid, AccessPathFrontNil nil |
+    flowCandFwd(mid, fromArg, nil, config) and
+    localFlowBigStepExt(mid, node, false, apf, config)
+  )
+  or
  nodeCand2(node, unbind(config)) and
  (
    exists(NodeExt mid |
@@ -1518,16 +1528,6 @@ private predicate flowCandFwd0(
    )
  )
  or
-  exists(NodeExt mid |
-    flowCandFwd(mid, fromArg, apf, config) and
-    localFlowBigStepExt(mid, node, true, _, config)
-  )
-  or
-  exists(NodeExt mid, AccessPathFrontNil nil |
-    flowCandFwd(mid, fromArg, nil, config) and
-    localFlowBigStepExt(mid, node, false, apf, config)
-  )
-  or
  exists(NodeExt mid, Content f |
    flowCandFwd(mid, fromArg, _, config) and
    storeExtCand2(mid, f, node, config) and
@@ -1538,7 +1538,7 @@ private predicate flowCandFwd0(
  exists(Content f |
    flowCandFwdRead(f, node, fromArg, config) and
    consCandFwd(f, apf, config) and
-    nodeCand2(node, _, unbindBool(apf.toBool()), unbind(config))
+    nodeCand2(node, _, unbindBool(apf.toBoolNonEmpty()), unbind(config))
  )
 }

@@ -1897,7 +1897,7 @@ private predicate flowFwdStore1(
  flowFwdStore0(mid, f, node, apf0, config) and
  consCand(f, apf0, config) and
  apf.headUsesContent(f) and
-  flowCand(node, _, apf, config)
+  flowCand(node, _, apf, unbind(config))
 }

 pragma[nomagic]
@@ -2025,7 +2025,8 @@ private predicate readFwd(
 ) {
  readExtCand2(node1, f, node2, config) and
  flowFwdRead(node2, f, ap, _, config) and
-  ap0 = pop(f, ap)
+  ap0 = pop(f, ap) and
+  flowConsCandFwd(f, _, ap0, unbind(config))
 }

 pragma[nomagic]
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -1430,7 +1430,7 @@ abstract private class AccessPathFront extends TAccessPathFront {

  abstract DataFlowType getType();

-  abstract boolean toBool();
+  abstract boolean toBoolNonEmpty();

  predicate headUsesContent(Content f) { this = TFrontHead(f) }
 }
@@ -1442,7 +1442,7 @@ private class AccessPathFrontNil extends AccessPathFront, TFrontNil {

  override DataFlowType getType() { this = TFrontNil(result) }

-  override boolean toBool() { result = false }
+  override boolean toBoolNonEmpty() { result = false }
 }

 private class AccessPathFrontHead extends AccessPathFront, TFrontHead {
@@ -1452,7 +1452,7 @@ private class AccessPathFrontHead extends AccessPathFront, TFrontHead {
    exists(Content head | this = TFrontHead(head) | result = head.getContainerType())
  }

-  override boolean toBool() { result = true }
+  override boolean toBoolNonEmpty() { result = true }
 }

 /**
@@ -1477,6 +1477,16 @@ private predicate flowCandFwd0(
  fromArg = false and
  apf = TFrontNil(node.getErasedNodeTypeBound())
  or
+  exists(NodeExt mid |
+    flowCandFwd(mid, fromArg, apf, config) and
+    localFlowBigStepExt(mid, node, true, _, config)
+  )
+  or
+  exists(NodeExt mid, AccessPathFrontNil nil |
+    flowCandFwd(mid, fromArg, nil, config) and
+    localFlowBigStepExt(mid, node, false, apf, config)
+  )
+  or
  nodeCand2(node, unbind(config)) and
  (
    exists(NodeExt mid |
@@ -1518,16 +1528,6 @@ private predicate flowCandFwd0(
    )
  )
  or
-  exists(NodeExt mid |
-    flowCandFwd(mid, fromArg, apf, config) and
-    localFlowBigStepExt(mid, node, true, _, config)
-  )
-  or
-  exists(NodeExt mid, AccessPathFrontNil nil |
-    flowCandFwd(mid, fromArg, nil, config) and
-    localFlowBigStepExt(mid, node, false, apf, config)
-  )
-  or
  exists(NodeExt mid, Content f |
    flowCandFwd(mid, fromArg, _, config) and
    storeExtCand2(mid, f, node, config) and
@@ -1538,7 +1538,7 @@ private predicate flowCandFwd0(
  exists(Content f |
    flowCandFwdRead(f, node, fromArg, config) and
    consCandFwd(f, apf, config) and
-    nodeCand2(node, _, unbindBool(apf.toBool()), unbind(config))
+    nodeCand2(node, _, unbindBool(apf.toBoolNonEmpty()), unbind(config))
  )
 }

@@ -1897,7 +1897,7 @@ private predicate flowFwdStore1(
  flowFwdStore0(mid, f, node, apf0, config) and
  consCand(f, apf0, config) and
  apf.headUsesContent(f) and
-  flowCand(node, _, apf, config)
+  flowCand(node, _, apf, unbind(config))
 }

 pragma[nomagic]
@@ -2025,7 +2025,8 @@ private predicate readFwd(
 ) {
  readExtCand2(node1, f, node2, config) and
  flowFwdRead(node2, f, ap, _, config) and
-  ap0 = pop(f, ap)
+  ap0 = pop(f, ap) and
+  flowConsCandFwd(f, _, ap0, unbind(config))
 }

 pragma[nomagic]