Skip to content

Commit 9d50fc6

Browse files
authored
Merge pull request github#10487 from MathiasVP/fix-identical-files-for-cpp
C++: Add shared files in `experimental` to `identical-files.json`.
2 parents 0720fa7 + 74ccec7 commit 9d50fc6

File tree

4 files changed

+27
-3
lines changed

4 files changed

+27
-3
lines changed

config/identical-files.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll",
1818
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll",
1919
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll",
20+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll",
21+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll",
22+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll",
23+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll",
2024
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll",
2125
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll",
2226
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll",
@@ -37,6 +41,7 @@
3741
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll",
3842
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll",
3943
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll",
44+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll",
4045
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll",
4146
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll",
4247
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll",
@@ -48,6 +53,9 @@
4853
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
4954
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
5055
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
56+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
57+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
58+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
5159
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
5260
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
5361
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
@@ -68,6 +76,7 @@
6876
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll",
6977
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplConsistency.qll",
7078
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll",
79+
"cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll",
7180
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplConsistency.qll",
7281
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplConsistency.qll",
7382
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplConsistency.qll",

cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,12 @@ abstract class Configuration extends DataFlow::Configuration {
172172
}
173173

174174
override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
175-
(this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
175+
(
176+
this.isSink(node) or
177+
this.isSink(node, _) or
178+
this.isAdditionalTaintStep(node, _) or
179+
this.isAdditionalTaintStep(node, _, _, _)
180+
) and
176181
defaultImplicitTaintRead(node, c)
177182
}
178183

cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,12 @@ abstract class Configuration extends DataFlow::Configuration {
172172
}
173173

174174
override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
175-
(this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
175+
(
176+
this.isSink(node) or
177+
this.isSink(node, _) or
178+
this.isAdditionalTaintStep(node, _) or
179+
this.isAdditionalTaintStep(node, _, _, _)
180+
) and
176181
defaultImplicitTaintRead(node, c)
177182
}
178183

cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,12 @@ abstract class Configuration extends DataFlow::Configuration {
172172
}
173173

174174
override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
175-
(this.isSink(node) or this.isAdditionalTaintStep(node, _)) and
175+
(
176+
this.isSink(node) or
177+
this.isSink(node, _) or
178+
this.isAdditionalTaintStep(node, _) or
179+
this.isAdditionalTaintStep(node, _, _, _)
180+
) and
176181
defaultImplicitTaintRead(node, c)
177182
}
178183

0 commit comments

Comments
 (0)