Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 691d0f3

Browse files
author
Robert Marsh
committed
Merge branch 'main' into rdmarsh2/cpp/output-iterators-1
Fix merge conflict in test expectations
2 parents 44c5233 + 86404af commit 691d0f3

425 files changed

Lines changed: 20295 additions & 4095 deletions

File tree

Some content is hidden

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

‎.github/workflows/query-list.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Build code scanning query list
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- 'rc/**'
8+
pull_request:
9+
paths:
10+
- '.github/workflows/query-list.yml'
11+
- 'misc/scripts/generate-code-scanning-query-list.py'
12+
13+
jobs:
14+
build:
15+
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Clone self (github/codeql)
20+
uses: actions/checkout@v2
21+
with:
22+
path: codeql
23+
- name: Clone github/codeql-go
24+
uses: actions/checkout@v2
25+
with:
26+
repository: 'github/codeql-go'
27+
path: codeql-go
28+
- name: Set up Python 3.8
29+
uses: actions/setup-python@v2
30+
with:
31+
python-version: 3.8
32+
- name: Download CodeQL CLI
33+
uses: dsaltares/fetch-gh-release-asset@aa37ae5c44d3c9820bc12fe675e8670ecd93bd1c
34+
with:
35+
repo: "github/codeql-cli-binaries"
36+
version: "latest"
37+
file: "codeql-linux64.zip"
38+
token: ${{ secrets.GITHUB_TOKEN }}
39+
- name: Unzip CodeQL CLI
40+
run: unzip -d codeql-cli codeql-linux64.zip
41+
- name: Build code scanning query list
42+
run: |
43+
PATH="$PATH:codeql-cli/codeql" python codeql/misc/scripts/generate-code-scanning-query-list.py > code-scanning-query-list.csv
44+
- name: Upload code scanning query list
45+
uses: actions/upload-artifact@v2
46+
with:
47+
name: code-scanning-query-list
48+
path: code-scanning-query-list.csv
49+

‎change-notes/1.26/analysis-cpp.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ The following changes in version 1.26 affect C/C++ analysis in all applications.
2020

2121
## Changes to libraries
2222

23+
* The QL class `Block`, denoting the `{ ... }` statement, is renamed to `BlockStmt`.
2324
* The models library now models many taint flows through `std::array`, `std::vector`, `std::deque`, `std::list` and `std::forward_list`.
2425
* The models library now models many more taint flows through `std::string`.
26+
* The models library now models some taint flows through `std::ostream`.
27+
* The models library now models some taint flows through `std::shared_ptr`, `std::unique_ptr`, `std::make_shared` and `std::make_unique`.
2528
* The `SimpleRangeAnalysis` library now supports multiplications of the form
2629
`e1 * e2` and `x *= e2` when `e1` and `e2` are unsigned or constant.

‎change-notes/1.26/analysis-java.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Improvements to Java analysis
2+
3+
The following changes in version 1.26 affect Java analysis in all applications.
4+
5+
## General improvements
6+
7+
## New queries
8+
9+
| **Query** | **Tags** | **Purpose** |
10+
|-----------------------------|-----------|--------------------------------------------------------------------|
11+
12+
13+
## Changes to existing queries
14+
15+
| **Query** | **Expected impact** | **Change** |
16+
|------------------------------|------------------------|-----------------------------------|
17+
18+
19+
## Changes to libraries
20+
21+
* The QL class `Block`, denoting the `{ ... }` statement, is renamed to `BlockStmt`.

‎change-notes/1.26/analysis-javascript.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@
33
## General improvements
44

55
* Support for the following frameworks and libraries has been improved:
6+
- [bluebird](https://www.npmjs.com/package/bluebird)
67
- [fast-json-stable-stringify](https://www.npmjs.com/package/fast-json-stable-stringify)
78
- [fast-safe-stringify](https://www.npmjs.com/package/fast-safe-stringify)
89
- [javascript-stringify](https://www.npmjs.com/package/javascript-stringify)
910
- [js-stringify](https://www.npmjs.com/package/js-stringify)
1011
- [json-stable-stringify](https://www.npmjs.com/package/json-stable-stringify)
1112
- [json-stringify-safe](https://www.npmjs.com/package/json-stringify-safe)
1213
- [json3](https://www.npmjs.com/package/json3)
14+
- [lodash](https://www.npmjs.com/package/lodash)
1315
- [object-inspect](https://www.npmjs.com/package/object-inspect)
1416
- [pretty-format](https://www.npmjs.com/package/pretty-format)
1517
- [stringify-object](https://www.npmjs.com/package/stringify-object)
18+
- [underscore](https://www.npmjs.com/package/underscore)
1619

1720
* Analyzing files with the ".cjs" extension is now supported.
1821

@@ -30,7 +33,9 @@
3033
| Incomplete URL substring sanitization (`js/incomplete-url-substring-sanitization`) | More results | This query now recognizes additional URLs when the substring check is an inclusion check. |
3134
| Ambiguous HTML id attribute (`js/duplicate-html-id`) | Results no longer shown | Precision tag reduced to "low". The query is no longer run by default. |
3235
| Unused loop iteration variable (`js/unused-loop-variable`) | Fewer results | This query no longer flags variables in a destructuring array assignment that are not the last variable in the destructed array. |
36+
| Unsafe shell command constructed from library input (`js/shell-command-constructed-from-input`) | More results | This query now recognizes more commands where colon, dash, and underscore are used. |
3337
| Unsafe jQuery plugin (`js/unsafe-jquery-plugin`) | More results | This query now detects more unsafe uses of nested option properties. |
38+
| Client-side URL redirect (`js/client-side-unvalidated-url-redirection`) | More results | This query now recognizes some unsafe uses of `importScripts()` inside WebWorkers. |
3439

3540

3641
## Changes to libraries

‎cpp/ql/examples/snippets/emptyblock.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
import cpp
1111

12-
from Block blk
12+
from BlockStmt blk
1313
where blk.getNumStmt() = 0
1414
select blk

‎cpp/ql/examples/snippets/emptythen.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
import cpp
1414

1515
from IfStmt i
16-
where i.getThen().(Block).getNumStmt() = 0
16+
where i.getThen().(BlockStmt).getNumStmt() = 0
1717
select i

‎cpp/ql/examples/snippets/singletonblock.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88

99
import cpp
1010

11-
from Block b
11+
from BlockStmt b
1212
where b.getNumStmt() = 1
1313
select b

‎cpp/ql/src/Best Practices/BlockWithTooManyStatements.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import cpp
1414

1515
class ComplexStmt extends Stmt {
1616
ComplexStmt() {
17-
exists(Block body |
17+
exists(BlockStmt body |
1818
body = this.(Loop).getStmt() or
1919
body = this.(SwitchStmt).getStmt()
2020
|
@@ -24,7 +24,7 @@ class ComplexStmt extends Stmt {
2424
}
2525
}
2626

27-
from Block b, int n, ComplexStmt complexStmt
27+
from BlockStmt b, int n, ComplexStmt complexStmt
2828
where
2929
n = strictcount(ComplexStmt s | s = b.getAStmt()) and
3030
n > 3 and

‎cpp/ql/src/Best Practices/Hiding/DeclarationHidesVariable.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ where
1717
shadowing(lv1, lv2) and
1818
not lv1.isCompilerGenerated() and
1919
not lv2.isCompilerGenerated() and
20-
not lv1.getParentScope().(Block).isInMacroExpansion() and
21-
not lv2.getParentScope().(Block).isInMacroExpansion()
20+
not lv1.getParentScope().(BlockStmt).isInMacroExpansion() and
21+
not lv2.getParentScope().(BlockStmt).isInMacroExpansion()
2222
select lv1, "Variable " + lv1.getName() + " hides another variable of the same name (on $@).", lv2,
2323
"line " + lv2.getLocation().getStartLine().toString()

‎cpp/ql/src/Best Practices/Likely Errors/EmptyBlock.ql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import cpp
1616

17-
predicate emptyBlock(ControlStructure s, Block b) {
17+
predicate emptyBlock(ControlStructure s, BlockStmt b) {
1818
b = s.getAChild() and
1919
not exists(b.getAChild()) and
2020
not b.isInMacroExpansion() and
@@ -23,7 +23,7 @@ predicate emptyBlock(ControlStructure s, Block b) {
2323

2424
class AffectedFile extends File {
2525
AffectedFile() {
26-
exists(Block b |
26+
exists(BlockStmt b |
2727
emptyBlock(_, b) and
2828
this = b.getFile()
2929
)
@@ -37,7 +37,7 @@ class AffectedFile extends File {
3737
class BlockOrNonChild extends Element {
3838
BlockOrNonChild() {
3939
(
40-
this instanceof Block
40+
this instanceof BlockStmt
4141
or
4242
this instanceof Comment
4343
or
@@ -78,7 +78,7 @@ class BlockOrNonChild extends Element {
7878
/**
7979
* A block that contains a non-child element.
8080
*/
81-
predicate emptyBlockContainsNonchild(Block b) {
81+
predicate emptyBlockContainsNonchild(BlockStmt b) {
8282
emptyBlock(_, b) and
8383
exists(BlockOrNonChild c, AffectedFile file |
8484
c.(BlockOrNonChild).getStartRankIn(file) = 1 + b.(BlockOrNonChild).getStartRankIn(file) and
@@ -91,7 +91,7 @@ predicate emptyBlockContainsNonchild(Block b) {
9191
* A block that is entirely on one line, which also contains a comment. Chances
9292
* are the comment is intended to refer to the block.
9393
*/
94-
predicate lineComment(Block b) {
94+
predicate lineComment(BlockStmt b) {
9595
emptyBlock(_, b) and
9696
exists(Location bLocation, File f, int line |
9797
bLocation = b.getLocation() and
@@ -106,7 +106,7 @@ predicate lineComment(Block b) {
106106
)
107107
}
108108

109-
from ControlStructure s, Block eb
109+
from ControlStructure s, BlockStmt eb
110110
where
111111
emptyBlock(s, eb) and
112112
not emptyBlockContainsNonchild(eb) and

0 commit comments

Comments
 (0)