Skip to content

Commit bbb1ee9

Browse files
committed
Merge branch 'main' into js-insecure-http-parser
2 parents cb90f9a + 03e7637 commit bbb1ee9

File tree

895 files changed

+135189
-114742
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

895 files changed

+135189
-114742
lines changed

.github/workflows/atm-check-query-suite.yml

Lines changed: 0 additions & 102 deletions
This file was deleted.

.github/workflows/atm-model-integration-tests.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

config/identical-files.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@
123123
"java/ql/src/utils/modelgenerator/internal/CaptureModels.qll",
124124
"csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll"
125125
],
126+
"Model as Data Generation Java/C# - CaptureModelsPrinting": [
127+
"java/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll",
128+
"csharp/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll"
129+
],
126130
"Sign Java/C#": [
127131
"java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll",
128132
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/Sign.qll"
@@ -596,4 +600,4 @@
596600
"python/ql/lib/semmle/python/security/internal/EncryptionKeySizes.qll",
597601
"java/ql/lib/semmle/code/java/security/internal/EncryptionKeySizes.qll"
598602
]
599-
}
603+
}

cpp/ql/lib/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.6.1
2+
3+
No user-facing changes.
4+
15
## 0.6.0
26

37
### Breaking Changes
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## 0.6.1
2+
3+
No user-facing changes.

cpp/ql/lib/codeql-pack.release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
lastReleaseVersion: 0.6.0
2+
lastReleaseVersion: 0.6.1

cpp/ql/lib/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/cpp-all
2-
version: 0.6.1-dev
2+
version: 0.7.0-dev
33
groups: cpp
44
dbscheme: semmlecode.cpp.dbscheme
55
extractor: cpp

cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowDispatch.qll

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,13 @@ class ArgumentPosition extends int {
7979
/** Holds if arguments at position `apos` match parameters at position `ppos`. */
8080
pragma[inline]
8181
predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { ppos = apos }
82+
83+
/**
84+
* Holds if flow from `call`'s argument `arg` to parameter `p` is permissible.
85+
*
86+
* This is a temporary hook to support technical debt in the Go language; do not use.
87+
*/
88+
pragma[inline]
89+
predicate golangSpecificParamArgFilter(DataFlowCall call, ParameterNode p, ArgumentNode arg) {
90+
any()
91+
}

cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,8 @@ private module Cached {
425425
exists(ParameterPosition ppos |
426426
viableParam(call, ppos, p) and
427427
argumentPositionMatch(call, arg, ppos) and
428-
compatibleTypes(getNodeDataFlowType(arg), getNodeDataFlowType(p))
428+
compatibleTypes(getNodeDataFlowType(arg), getNodeDataFlowType(p)) and
429+
golangSpecificParamArgFilter(call, p, arg)
429430
)
430431
}
431432

cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,3 +271,13 @@ Function viableImplInCallContext(CallInstruction call, CallInstruction ctx) {
271271
/** Holds if arguments at position `apos` match parameters at position `ppos`. */
272272
pragma[inline]
273273
predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { ppos = apos }
274+
275+
/**
276+
* Holds if flow from `call`'s argument `arg` to parameter `p` is permissible.
277+
*
278+
* This is a temporary hook to support technical debt in the Go language; do not use.
279+
*/
280+
pragma[inline]
281+
predicate golangSpecificParamArgFilter(DataFlowCall call, ParameterNode p, ArgumentNode arg) {
282+
any()
283+
}

0 commit comments

Comments
 (0)