Skip to content

Commit 2fa1c5e

Browse files
authored
Merge branch 'main' into redsun82/rust-analysis
2 parents af3be84 + 655fa53 commit 2fa1c5e

File tree

318 files changed

+16386
-15278
lines changed

Some content is hidden

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

318 files changed

+16386
-15278
lines changed

config/identical-files.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,5 @@
351351
"Python model summaries test extension": [
352352
"python/ql/test/library-tests/dataflow/model-summaries/InlineTaintTest.ext.yml",
353353
"python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ext.yml"
354-
],
355-
"Diagnostics.qll": [
356-
"ruby/ql/lib/codeql/ruby/Diagnostics.qll",
357-
"rust/ql/lib/codeql/rust/Diagnostics.qll"
358354
]
359355
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
| tests.c:3:74:3:74 | 1 | This format specifier for type 'char *' does not match the argument type 'int'. |
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Likely Bugs/Format/WrongTypeFormatArguments.ql
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
void f() {
2+
char buf[35];
3+
__builtin___sprintf_chk(buf, 0, __builtin_object_size(buf, 1), "%s", 1);
4+
__builtin___sprintf_chk(buf, 0, __builtin_object_size(buf, 1), "%d", 1);
5+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: majorAnalysis
3+
---
4+
* The generated .NET 8 runtime models have been updated.

csharp/ql/lib/ext/System.IO.model.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,19 @@ extensions:
112112
- ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Text.Encoding,System.Boolean,System.IO.FileStreamOptions)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
113113
- ["System.IO", "StreamReader", False, "StreamReader", "(System.String,System.Text.Encoding,System.Boolean,System.Int32)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
114114
- ["System.IO", "StringReader", False, "StringReader", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
115+
- ["System.IO", "StringWriter", True, "GetStringBuilder", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
116+
- ["System.IO", "StringWriter", False, "StringWriter", "(System.Text.StringBuilder,System.IFormatProvider)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
117+
- ["System.IO", "StringWriter", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
118+
- ["System.IO", "StringWriter", True, "Write", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
119+
- ["System.IO", "StringWriter", True, "Write", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
120+
- ["System.IO", "StringWriter", True, "Write", "(System.Text.StringBuilder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
121+
- ["System.IO", "StringWriter", True, "WriteAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
122+
- ["System.IO", "StringWriter", True, "WriteAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
123+
- ["System.IO", "StringWriter", True, "WriteAsync", "(System.Text.StringBuilder,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
124+
- ["System.IO", "StringWriter", True, "WriteLine", "(System.Text.StringBuilder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
125+
- ["System.IO", "StringWriter", True, "WriteLineAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
126+
- ["System.IO", "StringWriter", True, "WriteLineAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
127+
- ["System.IO", "StringWriter", True, "WriteLineAsync", "(System.Text.StringBuilder,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
115128
- ["System.IO", "TextReader", True, "Read", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
116129
- ["System.IO", "TextReader", True, "Read", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
117130
- ["System.IO", "TextReader", True, "Read", "(System.Span<System.Char>)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]

csharp/ql/lib/ext/generated/ILCompiler.IBC.model.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ extensions:
44
pack: codeql/csharp-all
55
extensible: summaryModel
66
data:
7-
- ["ILCompiler.IBC", "IBCProfileData", False, "IBCProfileData", "(ILCompiler.IBC.MibcConfig,System.Boolean,System.Collections.Generic.IEnumerable<ILCompiler.MethodProfileData>)", "", "Argument[0]", "Argument[this]", "taint", "df-generated"]
7+
- ["ILCompiler.IBC", "IBCProfileData", False, "IBCProfileData", "(ILCompiler.IBC.MibcConfig,System.Boolean,System.Collections.Generic.IEnumerable<ILCompiler.MethodProfileData>)", "", "Argument[0]", "Argument[this].SyntheticField[ILCompiler.IBC.IBCProfileData._config]", "value", "dfc-generated"]
8+
- ["ILCompiler.IBC", "IBCProfileData", True, "get_Config", "()", "", "Argument[this].SyntheticField[ILCompiler.IBC.IBCProfileData._config]", "ReturnValue", "value", "dfc-generated"]
89
- ["ILCompiler.IBC", "MibcConfig", False, "FromKeyValueMap", "(System.Collections.Generic.Dictionary<System.String,System.String>)", "", "Argument[0].Element", "ReturnValue", "taint", "df-generated"]
910
- ["ILCompiler.IBC", "MibcConfig", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
1011
- addsTo:

csharp/ql/lib/ext/generated/ILCompiler.Reflection.ReadyToRun.Amd64.model.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ extensions:
44
pack: codeql/csharp-all
55
extensible: summaryModel
66
data:
7-
- ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcSlotTable+GcSlot", False, "GcSlot", "(System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcStackSlot,ILCompiler.Reflection.ReadyToRun.GcSlotFlags,System.Boolean)", "", "Argument[2]", "Argument[this]", "taint", "df-generated"]
8-
- ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcTransition", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
7+
- ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcSlotTable+GcSlot", False, "GcSlot", "(System.Int32,System.Int32,ILCompiler.Reflection.ReadyToRun.GcStackSlot,ILCompiler.Reflection.ReadyToRun.GcSlotFlags,System.Boolean)", "", "Argument[2]", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.Amd64.GcSlotTable+GcSlot.StackSlot]", "value", "dfc-generated"]
8+
- ["ILCompiler.Reflection.ReadyToRun.Amd64", "GcTransition", False, "ToString", "()", "", "Argument[this].Property[ILCompiler.Reflection.ReadyToRun.Amd64.GcTransition.SlotState]", "ReturnValue", "value", "dfc-generated"]
99
- ["ILCompiler.Reflection.ReadyToRun.Amd64", "UnwindInfo", False, "ToString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-generated"]
1010
- addsTo:
1111
pack: codeql/csharp-all

0 commit comments

Comments
 (0)