Skip to content

Commit 4971355

Browse files
authored
Merge branch 'main' into codeql-spark-run-21376405640
2 parents ccc4d8a + 2214a94 commit 4971355

File tree

423 files changed

+82935
-31536
lines changed

Some content is hidden

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

423 files changed

+82935
-31536
lines changed

.github/workflows/ql-for-ql-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
uses: github/codeql-action/init@main
2828
with:
2929
languages: javascript # does not matter
30+
tools: nightly
3031
- uses: ./.github/actions/os-version
3132
id: os_version
3233
### Build the extractor ###

.github/workflows/ql-for-ql-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
uses: github/codeql-action/init@main
3131
with:
3232
languages: javascript # does not matter
33+
tools: nightly
3334
- uses: ./.github/actions/os-version
3435
id: os_version
3536
- uses: actions/cache@v3
@@ -75,6 +76,7 @@ jobs:
7576
uses: github/codeql-action/init@main
7677
with:
7778
languages: javascript # does not matter
79+
tools: nightly
7880
- uses: ./.github/actions/os-version
7981
id: os_version
8082
- uses: actions/cache@v3
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: fix
3+
---
4+
* Fixed a crash when analysing a `${{ ... }}` expression over around 300 characters in length.

actions/ql/lib/codeql/actions/ast/internal/Ast.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ string getADelimitedExpression(YamlString s, int offset) {
2727
// not just the last (greedy match) or first (reluctant match).
2828
result =
2929
s.getValue()
30-
.regexpFind("\\$\\{\\{(?:[^}]|}(?!}))*\\}\\}", _, offset)
31-
.regexpCapture("(\\$\\{\\{(?:[^}]|}(?!}))*\\}\\})", 1)
30+
.regexpFind("\\$\\{\\{(?:[^}]|}(?!}))*+\\}\\}", _, offset)
31+
.regexpCapture("(\\$\\{\\{(?:[^}]|}(?!}))*+\\}\\})", 1)
3232
.trim()
3333
}
3434

actions/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/actions-all
2-
version: 0.4.26
2+
version: 0.4.27-dev
33
library: true
44
warnOnImplicitThis: true
55
dependencies:

actions/ql/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/actions-queries
2-
version: 0.6.18
2+
version: 0.6.19-dev
33
library: false
44
warnOnImplicitThis: true
55
groups: [actions, queries]

actions/ql/test/library-tests/.github/workflows/commands.yml renamed to actions/ql/test/library-tests/basic/.github/workflows/commands.yml

File renamed without changes.

actions/ql/test/library-tests/.github/workflows/expression_nodes.yml renamed to actions/ql/test/library-tests/basic/.github/workflows/expression_nodes.yml

File renamed without changes.

actions/ql/test/library-tests/.github/workflows/many_strings.yml renamed to actions/ql/test/library-tests/basic/.github/workflows/many_strings.yml

File renamed without changes.

actions/ql/test/library-tests/.github/workflows/multiline.yml renamed to actions/ql/test/library-tests/basic/.github/workflows/multiline.yml

File renamed without changes.

0 commit comments

Comments
 (0)