Skip to content

Commit 5e11fe7

Browse files
committed
Merge branch 'main' into ts52
2 parents 78487d4 + 9bf5999 commit 5e11fe7

File tree

360 files changed

+1432
-1427
lines changed

Some content is hidden

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

360 files changed

+1432
-1427
lines changed

config/identical-files.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,5 +556,9 @@
556556
"EncryptionKeySizes Python/Java": [
557557
"python/ql/lib/semmle/python/security/internal/EncryptionKeySizes.qll",
558558
"java/ql/lib/semmle/code/java/security/internal/EncryptionKeySizes.qll"
559+
],
560+
"Python model summaries test extension": [
561+
"python/ql/test/experimental/dataflow/model-summaries/InlineTaintTest.ext.yml",
562+
"python/ql/test/experimental/dataflow/model-summaries/NormalDataflowTest.ext.yml"
559563
]
560564
}

cpp/autobuilder/Semmle.Autobuild.Cpp.Tests/Semmle.Autobuild.Cpp.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<ItemGroup>
1212
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
1313
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
14-
<PackageReference Include="xunit" Version="2.4.2" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
14+
<PackageReference Include="xunit" Version="2.5.0" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1818
</PackageReference>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

cpp/autobuilder/Semmle.Autobuild.Cpp/Semmle.Autobuild.Cpp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.Build" Version="17.3.2" />
20+
<PackageReference Include="Microsoft.Build" Version="17.7.2" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

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.9.1
2+
3+
No user-facing changes.
4+
15
## 0.9.0
26

37
### Breaking Changes
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: feature
3+
---
4+
* Added `DeleteOrDeleteArrayExpr` as a super type of `DeleteExpr` and `DeleteArrayExpr`
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: deprecated
3+
---
4+
* `getAllocatorCall` on `DeleteExpr` and `DeleteArrayExpr` has been deprecated. `getDeallocatorCall` should be used instead.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## 0.9.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.9.0
2+
lastReleaseVersion: 0.9.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.9.1-dev
2+
version: 0.9.2-dev
33
groups: cpp
44
dbscheme: semmlecode.cpp.dbscheme
55
extractor: cpp

cpp/ql/lib/semmle/code/cpp/PrintAST.qll

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -826,17 +826,11 @@ private predicate namedExprChildPredicates(Expr expr, Element ele, string pred)
826826
or
827827
expr.(Conversion).getExpr() = ele and pred = "getExpr()"
828828
or
829-
expr.(DeleteArrayExpr).getAllocatorCall() = ele and pred = "getAllocatorCall()"
829+
expr.(DeleteOrDeleteArrayExpr).getDeallocatorCall() = ele and pred = "getDeallocatorCall()"
830830
or
831-
expr.(DeleteArrayExpr).getDestructorCall() = ele and pred = "getDestructorCall()"
831+
expr.(DeleteOrDeleteArrayExpr).getDestructorCall() = ele and pred = "getDestructorCall()"
832832
or
833-
expr.(DeleteArrayExpr).getExpr() = ele and pred = "getExpr()"
834-
or
835-
expr.(DeleteExpr).getAllocatorCall() = ele and pred = "getAllocatorCall()"
836-
or
837-
expr.(DeleteExpr).getDestructorCall() = ele and pred = "getDestructorCall()"
838-
or
839-
expr.(DeleteExpr).getExpr() = ele and pred = "getExpr()"
833+
expr.(DeleteOrDeleteArrayExpr).getExpr() = ele and pred = "getExpr()"
840834
or
841835
expr.(DestructorFieldDestruction).getExpr() = ele and pred = "getExpr()"
842836
or

0 commit comments

Comments
 (0)