Skip to content

Commit b12b33c

Browse files
committed
Merge remote-tracking branch 'upstream/main' into 'rc/3.14'
2 parents 306e481 + a85f739 commit b12b33c

File tree

772 files changed

+16836
-17025
lines changed

Some content is hidden

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

772 files changed

+16836
-17025
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.2
1+
7.2.1

.github/workflows/ruby-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- .github/workflows/ruby-build.yml
88
- .github/actions/fetch-codeql/action.yml
99
- codeql-workspace.yml
10+
- "shared/tree-sitter-extractor/**"
1011
branches:
1112
- main
1213
- "rc/*"
@@ -16,6 +17,7 @@ on:
1617
- .github/workflows/ruby-build.yml
1718
- .github/actions/fetch-codeql/action.yml
1819
- codeql-workspace.yml
20+
- "shared/tree-sitter-extractor/**"
1921
branches:
2022
- main
2123
- "rc/*"

MODULE.bazel

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,45 @@ local_path_override(
1313

1414
# see https://registry.bazel.build/ for a list of available packages
1515

16-
bazel_dep(name = "platforms", version = "0.0.9")
17-
bazel_dep(name = "rules_go", version = "0.47.0")
16+
bazel_dep(name = "platforms", version = "0.0.10")
17+
bazel_dep(name = "rules_go", version = "0.48.0")
1818
bazel_dep(name = "rules_pkg", version = "0.10.1")
19-
bazel_dep(name = "rules_nodejs", version = "6.0.3")
20-
bazel_dep(name = "rules_python", version = "0.31.0")
21-
bazel_dep(name = "bazel_skylib", version = "1.5.0")
19+
bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")
20+
bazel_dep(name = "rules_python", version = "0.32.2")
21+
bazel_dep(name = "bazel_skylib", version = "1.6.1")
2222
bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "absl")
2323
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
2424
bazel_dep(name = "fmt", version = "10.0.0")
2525
bazel_dep(name = "rules_kotlin", version = "1.9.4-codeql.1")
26-
bazel_dep(name = "gazelle", version = "0.36.0")
26+
bazel_dep(name = "gazelle", version = "0.37.0")
2727
bazel_dep(name = "rules_dotnet", version = "0.15.1")
2828
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
29+
bazel_dep(name = "rules_rust", version = "0.46.0")
2930

3031
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
3132

33+
crate = use_extension(
34+
"@rules_rust//crate_universe:extension.bzl",
35+
"crate",
36+
)
37+
crate.from_cargo(
38+
name = "py_deps",
39+
cargo_lockfile = "//python/extractor/tsg-python:Cargo.lock",
40+
manifests = [
41+
"//python/extractor/tsg-python:Cargo.toml",
42+
"//python/extractor/tsg-python/tsp:Cargo.toml",
43+
],
44+
)
45+
crate.from_cargo(
46+
name = "ruby_deps",
47+
cargo_lockfile = "//ruby/extractor:Cargo.lock",
48+
manifests = [
49+
"//ruby/extractor:Cargo.toml",
50+
"//ruby/extractor/codeql-extractor-fake-crate:Cargo.toml",
51+
],
52+
)
53+
use_repo(crate, "py_deps", "ruby_deps")
54+
3255
dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
3356
dotnet.toolchain(dotnet_version = "8.0.101")
3457
use_repo(dotnet, "dotnet_toolchains")
@@ -62,6 +85,10 @@ use_repo(
6285
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
6386
node.toolchain(
6487
name = "nodejs",
88+
node_urls = [
89+
"https://nodejs.org/dist/v{version}/{filename}",
90+
"https://mirrors.dotsrc.org/nodejs/release/v{version}/{filename}",
91+
],
6592
node_version = "18.15.0",
6693
)
6794
use_repo(node, "nodejs", "nodejs_toolchains")

config/identical-files.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@
6161
"java/ql/src/utils/modelgenerator/internal/CaptureModels.qll",
6262
"csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll"
6363
],
64-
"Model as Data Generation Java/C# - CaptureModelsPrinting": [
65-
"java/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll",
66-
"csharp/ql/src/utils/modelgenerator/internal/CaptureModelsPrinting.qll"
67-
],
6864
"Sign Java/C#": [
6965
"java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll",
7066
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/Sign.qll"
@@ -185,11 +181,6 @@
185181
"cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/AliasAnalysisImports.qll",
186182
"cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasAnalysisImports.qll"
187183
],
188-
"C++ IR ValueNumberingImports": [
189-
"cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/internal/ValueNumberingImports.qll",
190-
"cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingImports.qll",
191-
"cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/internal/ValueNumberingImports.qll"
192-
],
193184
"IR SSA SSAConstruction": [
194185
"cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/SSAConstruction.qll",
195186
"cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* The "Guards" library (`semmle.code.cpp.controlflow.Guards`) now also infers guards from calls to the builtin operation `__builtin_expect`. As a result, some queries may produce fewer false positives.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* The queries "Potential double free" (`cpp/double-free`) and "Potential use after free" (`cpp/use-after-free`) now produce fewer false positives.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: feature
3+
---
4+
* It is now possible to extend the classes `AllocationFunction` and `DeallocationFunction` via data extensions. Extensions of these classes should be added to the `lib/ext/allocation` and `lib/ext/deallocation` directories respectively.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
extensions:
2+
- addsTo:
3+
pack: codeql/cpp-all
4+
extensible: allocationFunctionModel
5+
data:
6+
- ["", "", False, "kmem_alloc", "0", "", "", True]
7+
- ["", "", False, "kmem_zalloc", "0", "", "", True]
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
extensions:
2+
- addsTo:
3+
pack: codeql/cpp-all
4+
extensible: allocationFunctionModel
5+
data:
6+
- ["", "", False, "g_malloc", "0", "", "", True]
7+
- ["", "", False, "g_try_malloc", "0", "", "", True]
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
extensions:
2+
- addsTo:
3+
pack: codeql/cpp-all
4+
extensible: allocationFunctionModel
5+
data:
6+
- ["", "", False, "CRYPTO_malloc", "0", "", "", True]
7+
- ["", "", False, "CRYPTO_zalloc", "0", "", "", True]
8+
- ["", "", False, "CRYPTO_secure_malloc", "0", "", "", True]
9+
- ["", "", False, "CRYPTO_secure_zalloc", "0", "", "", True]
10+

0 commit comments

Comments
 (0)