Skip to content

Commit 48ab5b2

Browse files
committed
C#/Ruby/Java: Fix references.
1 parent 829eb7f commit 48ab5b2

File tree

7 files changed

+9
-7
lines changed

7 files changed

+9
-7
lines changed

csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ private module Cached {
760760
or
761761
// Simple flow through library code is included in the exposed local
762762
// step relation, even though flow is technically inter-procedural
763-
FlowSummaryImpl::Private::Steps::summaryThroughStep(nodeFrom, nodeTo, true)
763+
FlowSummaryImpl::Private::Steps::summaryThroughStepValue(nodeFrom, nodeTo)
764764
}
765765

766766
cached

csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private module Cached {
117117
(
118118
// Simple flow through library code is included in the exposed local
119119
// step relation, even though flow is technically inter-procedural
120-
FlowSummaryImpl::Private::Steps::summaryThroughStep(nodeFrom, nodeTo, false)
120+
FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(nodeFrom, nodeTo)
121121
or
122122
// Taint collection by adding a tainted element
123123
exists(DataFlow::ElementContent c |

csharp/ql/test/library-tests/dataflow/external-models/steps.ql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ class SummaryModelTest extends SummaryModelCsv {
3131
query predicate summaryThroughStep(
3232
DataFlow::Node node1, DataFlow::Node node2, boolean preservesValue
3333
) {
34-
FlowSummaryImpl::Private::Steps::summaryThroughStep(node1, node2, preservesValue)
34+
FlowSummaryImpl::Private::Steps::summaryThroughStepValue(node1, node2) and preservesValue = true
35+
or
36+
FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(node1, node2) and preservesValue = false
3537
}
3638

3739
query predicate summaryGetterStep(DataFlow::Node arg, DataFlow::Node out, Content c) {

java/ql/test/library-tests/dataflow/external-models/steps.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ class SummaryModelTest extends SummaryModelCsv {
2222
}
2323

2424
from DataFlow::Node node1, DataFlow::Node node2
25-
where FlowSummaryImpl::Private::Steps::summaryThroughStep(node1, node2, false)
25+
where FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(node1, node2)
2626
select node1, node2

java/ql/test/library-tests/dataflow/local-additional-taint/localAdditionalTaintStep.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ from DataFlow::Node src, DataFlow::Node sink
1616
where
1717
(
1818
localAdditionalTaintStep(src, sink) or
19-
FlowSummaryImpl::Private::Steps::summaryThroughStep(src, sink, false)
19+
FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(src, sink)
2020
) and
2121
not FlowSummaryImpl::Private::Steps::summaryLocalStep(src, sink, false) and
2222
not FlowSummaryImpl::Private::Steps::summaryReadStep(src, _, sink) and

ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ private module Cached {
270270
or
271271
// Simple flow through library code is included in the exposed local
272272
// step relation, even though flow is technically inter-procedural
273-
FlowSummaryImpl::Private::Steps::summaryThroughStep(nodeFrom, nodeTo, true)
273+
FlowSummaryImpl::Private::Steps::summaryThroughStepValue(nodeFrom, nodeTo)
274274
}
275275

276276
/** This is the local flow predicate that is used in type tracking. */

ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private module Cached {
119119
or
120120
// Simple flow through library code is included in the exposed local
121121
// step relation, even though flow is technically inter-procedural
122-
FlowSummaryImpl::Private::Steps::summaryThroughStep(nodeFrom, nodeTo, false)
122+
FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(nodeFrom, nodeTo)
123123
}
124124
}
125125

0 commit comments

Comments
 (0)