Skip to content

Commit 8729701

Browse files
yoffyoff
committed
Merge branch 'main' of github.com:github/codeql into python/port-modification-of-default-value
Files have moved around, specifically PrintNode.qll.
2 parents 29cb067 + 138a7ae commit 8729701

File tree

1,069 files changed

+31675
-9221
lines changed

Some content is hidden

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

1,069 files changed

+31675
-9221
lines changed

‎.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,6 @@
4848
*.gif -text
4949
*.dll -text
5050
*.pdb -text
51+
52+
java/ql/test/stubs/**/*.java linguist-generated=true
53+
java/ql/test/experimental/stubs/**/*.java linguist-generated=true

‎config/identical-files.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll",
2222
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll",
2323
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll",
24-
"python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl.qll",
25-
"python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl2.qll",
26-
"python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl3.qll",
27-
"python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl4.qll"
24+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll",
25+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll",
26+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll",
27+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll"
2828
],
2929
"DataFlow Java/C++/C#/Python Common": [
3030
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll",
3131
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll",
3232
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll",
3333
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll",
34-
"python/ql/src/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll"
34+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll"
3535
],
3636
"TaintTracking::Configuration Java/C++/C#/Python": [
3737
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
@@ -46,17 +46,17 @@
4646
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll",
4747
"java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
4848
"java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
49-
"python/ql/src/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingImpl.qll",
50-
"python/ql/src/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingImpl.qll",
51-
"python/ql/src/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll",
52-
"python/ql/src/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll"
49+
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingImpl.qll",
50+
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingImpl.qll",
51+
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll",
52+
"python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll"
5353
],
5454
"DataFlow Java/C++/C#/Python Consistency checks": [
5555
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll",
5656
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplConsistency.qll",
5757
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll",
5858
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplConsistency.qll",
59-
"python/ql/src/semmle/python/dataflow/new/internal/DataFlowImplConsistency.qll"
59+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplConsistency.qll"
6060
],
6161
"DataFlow Java/C# Flow Summaries": [
6262
"java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll",
@@ -382,8 +382,8 @@
382382
"cpp/ql/lib/semmle/code/cpp/XML.qll",
383383
"csharp/ql/lib/semmle/code/csharp/XML.qll",
384384
"java/ql/lib/semmle/code/xml/XML.qll",
385-
"javascript/ql/src/semmle/javascript/XML.qll",
386-
"python/ql/src/semmle/python/xml/XML.qll"
385+
"javascript/ql/lib/semmle/javascript/XML.qll",
386+
"python/ql/lib/semmle/python/xml/XML.qll"
387387
],
388388
"DuplicationProblems.inc.qhelp": [
389389
"cpp/ql/src/Metrics/Files/DuplicationProblems.inc.qhelp",
@@ -443,23 +443,23 @@
443443
"csharp/ql/lib/semmle/code/cil/internal/SsaImplCommon.qll"
444444
],
445445
"CryptoAlgorithms Python/JS": [
446-
"javascript/ql/src/semmle/javascript/security/CryptoAlgorithms.qll",
447-
"python/ql/src/semmle/python/concepts/CryptoAlgorithms.qll"
446+
"javascript/ql/lib/semmle/javascript/security/CryptoAlgorithms.qll",
447+
"python/ql/lib/semmle/python/concepts/CryptoAlgorithms.qll"
448448
],
449449
"SensitiveDataHeuristics Python/JS": [
450-
"javascript/ql/src/semmle/javascript/security/internal/SensitiveDataHeuristics.qll",
451-
"python/ql/src/semmle/python/security/internal/SensitiveDataHeuristics.qll"
450+
"javascript/ql/lib/semmle/javascript/security/internal/SensitiveDataHeuristics.qll",
451+
"python/ql/lib/semmle/python/security/internal/SensitiveDataHeuristics.qll"
452452
],
453453
"ReDoS Util Python/JS": [
454-
"javascript/ql/src/semmle/javascript/security/performance/ReDoSUtil.qll",
455-
"python/ql/src/semmle/python/security/performance/ReDoSUtil.qll"
454+
"javascript/ql/lib/semmle/javascript/security/performance/ReDoSUtil.qll",
455+
"python/ql/lib/semmle/python/security/performance/ReDoSUtil.qll"
456456
],
457457
"ReDoS Exponential Python/JS": [
458-
"javascript/ql/src/semmle/javascript/security/performance/ExponentialBackTracking.qll",
459-
"python/ql/src/semmle/python/security/performance/ExponentialBackTracking.qll"
458+
"javascript/ql/lib/semmle/javascript/security/performance/ExponentialBackTracking.qll",
459+
"python/ql/lib/semmle/python/security/performance/ExponentialBackTracking.qll"
460460
],
461461
"ReDoS Polynomial Python/JS": [
462-
"javascript/ql/src/semmle/javascript/security/performance/SuperlinearBackTracking.qll",
463-
"python/ql/src/semmle/python/security/performance/SuperlinearBackTracking.qll"
462+
"javascript/ql/lib/semmle/javascript/security/performance/SuperlinearBackTracking.qll",
463+
"python/ql/lib/semmle/python/security/performance/SuperlinearBackTracking.qll"
464464
]
465-
}
465+
}

‎cpp/change-notes/2021-08-23-ctime-weaken-claims.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
lgtm,codescanning
2+
* Lowered the precision of `cpp/potentially-dangerous-function` so it is run but not displayed on LGTM by default and so it's only run and displayed on Code Scanning if a broader suite like `cpp-security-extended` is opted into.

‎cpp/change-notes/2021-08-23-getPrimaryQlClasses.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
lgtm,codescanning
2+
* Added `Element.getPrimaryQlClasses()` predicate, which gets a comma-separated list of the names of the primary CodeQL classes to which this element belongs.

‎cpp/change-notes/2021-08-24-implicit-downcast-from-bitfield.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
lgtm,codescanning
2+
* The query `cpp/implicit-bitfield-downcast` now accounts for C++ reference types, which leads to more true positive results.

‎cpp/ql/examples/qlpack.lock.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
dependencies: {}
3+
compiled: false
4+
lockVersion: 1.0.0

‎cpp/ql/examples/qlpack.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
name: codeql-cpp-examples
2-
version: 0.0.0
3-
libraryPathDependencies: codeql/cpp-all
1+
name: codeql/cpp-examples
2+
version: 0.0.2
3+
dependencies:
4+
codeql/cpp-all: "*"

‎cpp/ql/lib/qlpack.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ version: 0.0.2
33
dbscheme: semmlecode.cpp.dbscheme
44
extractor: cpp
55
library: true
6+
dependencies:
7+
codeql/cpp-upgrades: 0.0.2

‎cpp/ql/lib/semmle/code/cpp/Element.qll

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ class ElementBase extends @element {
5858
/** DEPRECATED: use `getAPrimaryQlClass` instead. */
5959
deprecated string getCanonicalQLClass() { result = this.getAPrimaryQlClass() }
6060

61+
/**
62+
* Gets a comma-separated list of the names of the primary CodeQL classes to which this element belongs.
63+
*/
64+
final string getPrimaryQlClasses() { result = concat(getAPrimaryQlClass(), ",") }
65+
6166
/**
6267
* Gets the name of a primary CodeQL class to which this element belongs.
6368
*

‎cpp/ql/lib/semmle/code/cpp/Initializer.qll

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ import semmle.code.cpp.controlflow.ControlFlowGraph
1818
* ...
1919
* }
2020
* ```
21+
* But _not_ `4` in the following code:
22+
* ```
23+
* int myUninitializedVariable;
24+
* myUninitializedVariable = 4;
25+
* ```
26+
* Instead, this is an `Assignment`.
2127
*/
2228
class Initializer extends ControlFlowNode, @initialiser {
2329
override Location getLocation() { initialisers(underlyingElement(this), _, _, result) }

0 commit comments

Comments
 (0)