Skip to content

Commit 21b4931

Browse files
knewbury01knewbury01
authored
Merge branch 'main' into knewbury01/fix-js-cleartext-logging-doc
2 parents 231110d + 65863f1 commit 21b4931

File tree

97 files changed

+4941
-3468
lines changed

Some content is hidden

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

97 files changed

+4941
-3468
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828

2929
steps:
3030
- name: Setup dotnet
31-
uses: actions/setup-dotnet@v2
31+
uses: actions/setup-dotnet@v3
3232
with:
33-
dotnet-version: 6.0.202
33+
dotnet-version: 7.0.102
3434

3535
- name: Checkout repository
3636
uses: actions/checkout@v3

‎.github/workflows/csharp-qltest.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ jobs:
7777
- name: Setup dotnet
7878
uses: actions/setup-dotnet@v3
7979
with:
80-
dotnet-version: 6.0.202
80+
dotnet-version: 7.0.102
8181
- name: Extractor unit tests
8282
run: |
83-
dotnet test -p:RuntimeFrameworkVersion=6.0.4 "${{ github.workspace }}/csharp/extractor/Semmle.Util.Tests"
84-
dotnet test -p:RuntimeFrameworkVersion=6.0.4 "${{ github.workspace }}/csharp/extractor/Semmle.Extraction.Tests"
85-
dotnet test -p:RuntimeFrameworkVersion=6.0.4 "${{ github.workspace }}/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests"
86-
dotnet test -p:RuntimeFrameworkVersion=6.0.4 "${{ github.workspace }}/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests"
83+
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/csharp/extractor/Semmle.Util.Tests"
84+
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/csharp/extractor/Semmle.Extraction.Tests"
85+
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests"
86+
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
88
<Nullable>enable</Nullable>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<AssemblyName>Semmle.Autobuild.Cpp</AssemblyName>
66
<RootNamespace>Semmle.Autobuild.Cpp</RootNamespace>
77
<ApplicationIcon />

‎cpp/ql/src/Critical/MissingCheckScanf.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private predicate fwdFlow(Instruction instr, ValueNumber vn) {
100100
*/
101101
pragma[nomagic]
102102
predicate revFlow(Instruction instr, ValueNumber vn) {
103-
fwdFlow(instr, vn) and
103+
fwdFlow(instr, pragma[only_bind_out](vn)) and
104104
(
105105
isSink(instr, _, vn)
106106
or
@@ -126,7 +126,7 @@ class Node extends MkNode {
126126

127127
final string toString() { result = instr.toString() }
128128

129-
final Node getASuccessor() { result = MkNode(instr.getASuccessor(), vn) }
129+
final Node getASuccessor() { result = MkNode(pragma[only_bind_out](instr.getASuccessor()), vn) }
130130

131131
final Location getLocation() { result = instr.getLocation() }
132132
}
@@ -167,7 +167,7 @@ predicate hasFlow(
167167
) {
168168
exists(ValueNumber vn |
169169
isSource(call, index, source, vn, _) and
170-
hasFlow(getNode(source, vn), getNode(sink, vn)) and
170+
hasFlow(getNode(source, pragma[only_bind_into](vn)), getNode(sink, pragma[only_bind_into](vn))) and
171171
isSink(sink, access, vn)
172172
)
173173
}

‎csharp/actions/create-extractor-pack/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ runs:
66
- name: Setup dotnet
77
uses: actions/setup-dotnet@v3
88
with:
9-
dotnet-version: 6.0.202
9+
dotnet-version: 7.0.102
1010
- name: Build Extractor
1111
shell: bash
1212
run: scripts/create-extractor-pack.sh

‎csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/Semmle.Autobuild.CSharp.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
66
<Nullable>enable</Nullable>

‎csharp/autobuilder/Semmle.Autobuild.CSharp/Semmle.Autobuild.CSharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<AssemblyName>Semmle.Autobuild.CSharp</AssemblyName>
55
<RootNamespace>Semmle.Autobuild.CSharp</RootNamespace>
66
<ApplicationIcon/>

‎csharp/autobuilder/Semmle.Autobuild.Shared/Semmle.Autobuild.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<AssemblyName>Semmle.Autobuild.Shared</AssemblyName>
55
<RootNamespace>Semmle.Autobuild.Shared</RootNamespace>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎csharp/extractor/Semmle.Extraction.CIL.Driver/Semmle.Extraction.CIL.Driver.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<AssemblyName>Semmle.Extraction.CIL.Driver</AssemblyName>
77
<RootNamespace>Semmle.Extraction.CIL.Driver</RootNamespace>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

0 commit comments

Comments
 (0)