Skip to content

Commit 2e8a503

Browse files
lcarteylcartey
authored
Merge pull request #737 from github/codeql/upgrade-to-2.15.5
Upgrade `github/codeql` dependency to 2.15.5
2 parents 130c264 + 12b1c4e commit 2e8a503

34 files changed

+156
-115
lines changed

‎c/cert/src/codeql-pack.lock.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.3
5+
version: 0.12.2
66
codeql/dataflow:
7+
version: 0.1.5
8+
codeql/rangeanalysis:
79
version: 0.0.4
810
codeql/ssa:
9-
version: 0.1.5
11+
version: 0.2.5
1012
codeql/tutorial:
11-
version: 0.1.5
13+
version: 0.2.5
14+
codeql/typetracking:
15+
version: 0.2.5
1216
codeql/util:
13-
version: 0.1.5
17+
version: 0.2.5
1418
compiled: false

‎c/cert/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ suites: codeql-suites
55
license: MIT
66
dependencies:
77
codeql/common-c-coding-standards: '*'
8-
codeql/cpp-all: 0.9.3
8+
codeql/cpp-all: 0.12.2

‎c/cert/test/codeql-pack.lock.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.3
5+
version: 0.12.2
66
codeql/dataflow:
7+
version: 0.1.5
8+
codeql/rangeanalysis:
79
version: 0.0.4
810
codeql/ssa:
9-
version: 0.1.5
11+
version: 0.2.5
1012
codeql/tutorial:
11-
version: 0.1.5
13+
version: 0.2.5
14+
codeql/typetracking:
15+
version: 0.2.5
1216
codeql/util:
13-
version: 0.1.5
17+
version: 0.2.5
1418
compiled: false

‎c/common/src/codeql-pack.lock.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.3
5+
version: 0.12.2
66
codeql/dataflow:
7+
version: 0.1.5
8+
codeql/rangeanalysis:
79
version: 0.0.4
810
codeql/ssa:
9-
version: 0.1.5
11+
version: 0.2.5
1012
codeql/tutorial:
11-
version: 0.1.5
13+
version: 0.2.5
14+
codeql/typetracking:
15+
version: 0.2.5
1216
codeql/util:
13-
version: 0.1.5
17+
version: 0.2.5
1418
compiled: false

‎c/common/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ version: 2.36.0-dev
33
license: MIT
44
dependencies:
55
codeql/common-cpp-coding-standards: '*'
6-
codeql/cpp-all: 0.9.3
6+
codeql/cpp-all: 0.12.2

‎c/common/test/codeql-pack.lock.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.3
5+
version: 0.12.2
66
codeql/dataflow:
7+
version: 0.1.5
8+
codeql/rangeanalysis:
79
version: 0.0.4
810
codeql/ssa:
9-
version: 0.1.5
11+
version: 0.2.5
1012
codeql/tutorial:
11-
version: 0.1.5
13+
version: 0.2.5
14+
codeql/typetracking:
15+
version: 0.2.5
1216
codeql/util:
13-
version: 0.1.5
17+
version: 0.2.5
1418
compiled: false

‎c/misra/src/codeql-pack.lock.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.3
5+
version: 0.12.2
66
codeql/dataflow:
7+
version: 0.1.5
8+
codeql/rangeanalysis:
79
version: 0.0.4
810
codeql/ssa:
9-
version: 0.1.5
11+
version: 0.2.5
1012
codeql/tutorial:
11-
version: 0.1.5
13+
version: 0.2.5
14+
codeql/typetracking:
15+
version: 0.2.5
1216
codeql/util:
13-
version: 0.1.5
17+
version: 0.2.5
1418
compiled: false

‎c/misra/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ license: MIT
66
default-suite-file: codeql-suites/misra-c-default.qls
77
dependencies:
88
codeql/common-c-coding-standards: '*'
9-
codeql/cpp-all: 0.9.3
9+
codeql/cpp-all: 0.12.2

‎c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import cpp
1616
import codingstandards.c.misra
1717
import codingstandards.c.misra.EssentialTypes
18-
import codingstandards.cpp.Bitwise
1918

2019
/**
2120
* Holds if the operator `operator` has an operand `child` that is of an inappropriate essential type
@@ -179,8 +178,7 @@ predicate isInappropriateEssentialType(
179178
child =
180179
[
181180
operator.(BinaryBitwiseOperation).getAnOperand(),
182-
operator.(Bitwise::AssignBitwiseOperation).getAnOperand(),
183-
operator.(ComplementExpr).getAnOperand()
181+
operator.(AssignBitwiseOperation).getAnOperand(), operator.(ComplementExpr).getAnOperand()
184182
] and
185183
not operator instanceof LShiftExpr and
186184
not operator instanceof RShiftExpr and

‎c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,9 @@ where
4949
msg = "Function " + f + " does not specify void for no parameters present."
5050
or
5151
//parameters declared in declaration list (not in function signature)
52-
//have placeholder file location associated only
53-
exists(Parameter p |
54-
p.getFunction() = f and
55-
not p.getFile() = f.getFile() and
56-
msg = "Function " + f + " declares parameter in unsupported declaration list."
57-
)
52+
//have no prototype
53+
not f.isPrototyped() and
54+
not hasZeroParamDecl(f) and
55+
msg = "Function " + f + " declares parameter in unsupported declaration list."
5856
)
5957
select f, msg

‎c/misra/test/codeql-pack.lock.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.3
5+
version: 0.12.2
66
codeql/dataflow:
7+
version: 0.1.5
8+
codeql/rangeanalysis:
79
version: 0.0.4
810
codeql/ssa:
9-
version: 0.1.5
11+
version: 0.2.5
1012
codeql/tutorial:
11-
version: 0.1.5
13+
version: 0.2.5
14+
codeql/typetracking:
15+
version: 0.2.5
1216
codeql/util:
13-
version: 0.1.5
17+
version: 0.2.5
1418
compiled: false

‎change_notes/2024-10-07-upgrade-to-2.15.5.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Updated the CodeQL version to `2.15.5`.

‎cpp/autosar/src/codeql-pack.lock.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.3
5+
version: 0.12.2
66
codeql/dataflow:
7+
version: 0.1.5
8+
codeql/rangeanalysis:
79
version: 0.0.4
810
codeql/ssa:
9-
version: 0.1.5
11+
version: 0.2.5
1012
codeql/tutorial:
11-
version: 0.1.5
13+
version: 0.2.5
14+
codeql/typetracking:
15+
version: 0.2.5
1216
codeql/util:
13-
version: 0.1.5
17+
version: 0.2.5
1418
compiled: false

‎cpp/autosar/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ suites: codeql-suites
55
license: MIT
66
dependencies:
77
codeql/common-cpp-coding-standards: '*'
8-
codeql/cpp-all: 0.9.3
8+
codeql/cpp-all: 0.12.2

‎cpp/autosar/src/rules/M5-0-20/BitwiseOperatorOperandsHaveDifferentUnderlyingType.ql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616

1717
import cpp
1818
import codingstandards.cpp.autosar
19-
import codingstandards.cpp.Bitwise
2019
import codingstandards.cpp.Conversion
2120

2221
predicate isBinaryBitwiseOperation(Operation o, VariableAccess l, VariableAccess r) {
2322
exists(BinaryBitwiseOperation bbo | bbo = o |
2423
l = bbo.getLeftOperand() and r = bbo.getRightOperand()
2524
)
2625
or
27-
exists(Bitwise::AssignBitwiseOperation abo | abo = o |
26+
exists(AssignBitwiseOperation abo | abo = o |
2827
l = abo.getLValue() and
2928
r = abo.getRValue()
3029
)

‎cpp/autosar/src/rules/M5-0-21/BitwiseOperatorAppliedToSignedTypes.ql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717

1818
import cpp
1919
import codingstandards.cpp.autosar
20-
import codingstandards.cpp.Bitwise
2120

2221
from Operation o, VariableAccess va
2322
where
2423
not isExcluded(o, ExpressionsPackage::bitwiseOperatorAppliedToSignedTypesQuery()) and
2524
(
2625
o instanceof UnaryBitwiseOperation or
2726
o instanceof BinaryBitwiseOperation or
28-
o instanceof Bitwise::AssignBitwiseOperation
27+
o instanceof AssignBitwiseOperation
2928
) and
3029
o.getAnOperand() = va and
3130
va.getTarget().getUnderlyingType().(IntegralType).isSigned()

‎cpp/autosar/src/rules/M5-8-1/RightBitShiftOperandIsNegativeOrTooWide.ql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import cpp
1919
import codingstandards.cpp.autosar
20-
import codingstandards.cpp.Bitwise
2120

2221
class ShiftOperation extends Operation {
2322
Expr leftOperand;
@@ -34,7 +33,7 @@ class ShiftOperation extends Operation {
3433
rightOperand = o.getRightOperand()
3534
)
3635
or
37-
exists(Bitwise::AssignBitwiseOperation o | this = o |
36+
exists(AssignBitwiseOperation o | this = o |
3837
(
3938
o instanceof AssignLShiftExpr
4039
or

‎cpp/autosar/test/codeql-pack.lock.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.3
5+
version: 0.12.2
66
codeql/dataflow:
7+
version: 0.1.5
8+
codeql/rangeanalysis:
79
version: 0.0.4
810
codeql/ssa:
9-
version: 0.1.5
11+
version: 0.2.5
1012
codeql/tutorial:
11-
version: 0.1.5
13+
version: 0.2.5
14+
codeql/typetracking:
15+
version: 0.2.5
1216
codeql/util:
13-
version: 0.1.5
17+
version: 0.2.5
1418
compiled: false

‎cpp/cert/src/codeql-pack.lock.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.3
5+
version: 0.12.2
66
codeql/dataflow:
7+
version: 0.1.5
8+
codeql/rangeanalysis:
79
version: 0.0.4
810
codeql/ssa:
9-
version: 0.1.5
11+
version: 0.2.5
1012
codeql/tutorial:
11-
version: 0.1.5
13+
version: 0.2.5
14+
codeql/typetracking:
15+
version: 0.2.5
1216
codeql/util:
13-
version: 0.1.5
17+
version: 0.2.5
1418
compiled: false

‎cpp/cert/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ description: CERT C++ 2016
44
suites: codeql-suites
55
license: MIT
66
dependencies:
7-
codeql/cpp-all: 0.9.3
7+
codeql/cpp-all: 0.12.2
88
codeql/common-cpp-coding-standards: '*'

‎cpp/cert/src/rules/MEM53-CPP/ManuallyManagedLifetime.qll

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ module AllocToStaticCastConfig implements DataFlow::ConfigSig {
1414
predicate isSource(DataFlow::Node source) {
1515
exists(AllocationExpr ae |
1616
ae.getType().getUnspecifiedType() instanceof VoidPointerType and
17-
source.asExpr() = ae and
18-
// Ignore realloc, as that memory may already be partially constructed
19-
not ae.(FunctionCall).getTarget().getName().toLowerCase().matches("%realloc%")
17+
source.asExpr() = ae
2018
)
2119
}
2220

21+
predicate isBarrier(DataFlow::Node sanitizer) {
22+
// Ignore realloc, as that memory may already be partially constructed
23+
sanitizer.asExpr().(FunctionCall).getTarget().getName().toLowerCase().matches("%realloc%")
24+
}
25+
2326
predicate isSink(DataFlow::Node sink) {
2427
exists(StaticOrCStyleCast sc, Class nonTrivialClass |
2528
sc.getExpr() = sink.asExpr() and

‎cpp/cert/test/codeql-pack.lock.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.3
5+
version: 0.12.2
66
codeql/dataflow:
7+
version: 0.1.5
8+
codeql/rangeanalysis:
79
version: 0.0.4
810
codeql/ssa:
9-
version: 0.1.5
11+
version: 0.2.5
1012
codeql/tutorial:
11-
version: 0.1.5
13+
version: 0.2.5
14+
codeql/typetracking:
15+
version: 0.2.5
1216
codeql/util:
13-
version: 0.1.5
17+
version: 0.2.5
1418
compiled: false

‎cpp/common/src/codeql-pack.lock.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.3
5+
version: 0.12.2
66
codeql/dataflow:
7+
version: 0.1.5
8+
codeql/rangeanalysis:
79
version: 0.0.4
810
codeql/ssa:
9-
version: 0.1.5
11+
version: 0.2.5
1012
codeql/tutorial:
11-
version: 0.1.5
13+
version: 0.2.5
14+
codeql/typetracking:
15+
version: 0.2.5
1216
codeql/util:
13-
version: 0.1.5
17+
version: 0.2.5
1418
compiled: false

0 commit comments

Comments
 (0)