Skip to content

Commit 513dcf1

Browse files
authored
Merge branch 'main' into basicquery
2 parents 92122fe + a359a24 commit 513dcf1

34 files changed

+2233
-143
lines changed

docs/codeql/reusables/extractors.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
- ``python``
2121
* - Ruby
2222
- ``ruby``
23-
- Rust
23+
* - Rust
2424
- ``rust``
2525
* - Swift
2626
- ``swift``

docs/codeql/reusables/supported-frameworks.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,12 +324,15 @@ All support is experimental.
324324
Name, Category
325325
`actix-web <https://crates.io/crates/actix-web>`__, Web framework
326326
alloc, Standard library
327+
`async-std <https://crates.io/crates/async-std>`__, Asynchronous programming library
328+
`biscotti <https://crates.io/crates/biscotti>`__, Cookie management
327329
`clap <http://crates.io/crates/clap>`__, Utility library
330+
`cookie <https://crates.io/crates/cookie>`__, Cookie management
328331
core, Standard library
329332
`digest <https://crates.io/crates/digest>`__, Cryptography library
330-
`futures-executor <https://crates.io/crates/futures-executor>`__, Utility library
333+
`futures <https://crates.io/crates/futures>`__, Asynchronous programming library
334+
`futures-rustls <https://crates.io/crates/futures-rustls>`__, Network communicator
331335
`hyper <https://crates.io/crates/hyper>`__, HTTP library
332-
`hyper-util <https://crates.io/crates/hyper-util>`__, HTTP library
333336
`libc <https://crates.io/crates/libc>`__, Utility library
334337
`log <https://crates.io/crates/log>`__, Logging library
335338
`md5 <https://crates.io/crates/md5>`__, Utility library
@@ -345,12 +348,14 @@ All support is experimental.
345348
`rusqlite <https://crates.io/crates/rusqlite>`__, Database
346349
std, Standard library
347350
`rust-crypto <https://crates.io/crates/rust-crypto>`__, Cryptography library
351+
`rustls <https://crates.io/crates/rustls>`__, Network communicator
348352
`serde <https://crates.io/crates/serde>`__, Serialization
349353
`smallvec <https://crates.io/crates/smallvec>`__, Utility library
350354
`sqlx <https://crates.io/crates/sqlx>`__, Database
351355
`tokio <https://crates.io/crates/tokio>`__, Asynchronous IO
352356
`tokio-postgres <https://crates.io/crates/tokio-postgres>`__, Database
353357
`url <https://crates.io/crates/url>`__, Utility library
358+
`warp <https://crates.io/crates/warp>`__, Web framework
354359

355360
Swift built-in support
356361
================================

java/ql/integration-tests/java/evaluation-to-constant-errortype/ConstantExpAppearsNonConstant.expected

Whitespace-only changes.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
query: Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql
2+
postprocess: utils/test/InlineExpectationsTestQuery.ql
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
class Test {
2+
public static void updateFlashlights(Minecraft mc){
3+
if(mc.world != null){
4+
5+
}
6+
}
7+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
def test(codeql, java):
2+
codeql.database.create(build_mode="none")

java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ predicate isConstantExp(Expr e) {
1919
// A literal is constant.
2020
e instanceof Literal
2121
or
22-
e instanceof TypeAccess
22+
e instanceof TypeAccess and not e.(TypeAccess).getType() instanceof ErrorType
2323
or
2424
e instanceof ArrayTypeAccess
2525
or

rust/ql/integration-tests/query-suite/rust-code-scanning.qls.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql
1717
ql/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql
1818
ql/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.ql
1919
ql/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql
20+
ql/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql
2021
ql/rust/ql/src/queries/security/CWE-770/UncontrolledAllocationSize.ql
2122
ql/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
2223
ql/rust/ql/src/queries/security/CWE-825/AccessInvalidPointer.ql

rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql
1818
ql/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql
1919
ql/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.ql
2020
ql/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql
21+
ql/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql
2122
ql/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql
2223
ql/rust/ql/src/queries/security/CWE-770/UncontrolledAllocationSize.ql
2324
ql/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql

rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql
1818
ql/rust/ql/src/queries/security/CWE-319/UseOfHttp.ql
1919
ql/rust/ql/src/queries/security/CWE-327/BrokenCryptoAlgorithm.ql
2020
ql/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql
21+
ql/rust/ql/src/queries/security/CWE-614/InsecureCookie.ql
2122
ql/rust/ql/src/queries/security/CWE-770/UncontrolledAllocationSize.ql
2223
ql/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
2324
ql/rust/ql/src/queries/security/CWE-825/AccessAfterLifetime.ql

0 commit comments

Comments
 (0)