Skip to content

Commit 7b1cd70

Browse files
committed
Merge branch 'main' into xxe9
2 parents 9f3fa1c + c518150 commit 7b1cd70

File tree

123 files changed

+9634
-236
lines changed

Some content is hidden

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

123 files changed

+9634
-236
lines changed

config/identical-files.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,5 +553,9 @@
553553
"HttpToFileAccessCustomizations JS/Ruby": [
554554
"javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessCustomizations.qll",
555555
"ruby/ql/lib/codeql/ruby/security/HttpToFileAccessCustomizations.qll"
556+
],
557+
"Typo database": [
558+
"javascript/ql/src/Expressions/TypoDatabase.qll",
559+
"ql/ql/src/codeql_ql/style/TypoDatabase.qll"
556560
]
557561
}

cpp/ql/lib/semmle/code/cpp/Field.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Field extends MemberVariable {
3131
int getByteOffset() { fieldoffsets(underlyingElement(this), result, _) }
3232

3333
/**
34-
* Gets the byte offset within `mostDerivedClass` of each occurence of this
34+
* Gets the byte offset within `mostDerivedClass` of each occurrence of this
3535
* field within `mostDerivedClass` itself or a base class subobject of
3636
* `mostDerivedClass`.
3737
* Note that for fields of virtual base classes, and non-virtual base classes

cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ private predicate subEdge(Pos p1, Node n1, Node n2, Pos p2) {
970970
private predicate subEdgeIncludingDestructors(Pos p1, Node n1, Node n2, Pos p2) {
971971
subEdge(p1, n1, n2, p2)
972972
or
973-
// If `n1` has sub-nodes to accomodate destructors, but there are none to be
973+
// If `n1` has sub-nodes to accommodate destructors, but there are none to be
974974
// called, connect the "before destructors" node directly to the "after
975975
// destructors" node. For performance, only do this when the nodes exist.
976976
exists(Pos afterDtors | afterDtors.isAfterDestructors() | subEdge(afterDtors, n1, _, _)) and

cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ cached
305305
private module Cached {
306306
/**
307307
* If needed, call this predicate from `DataFlowImplSpecific.qll` in order to
308-
* force a stage-dependency on the `DataFlowImplCommon.qll` stage and therby
308+
* force a stage-dependency on the `DataFlowImplCommon.qll` stage and thereby
309309
* collapsing the two stages.
310310
*/
311311
cached

cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ cached
305305
private module Cached {
306306
/**
307307
* If needed, call this predicate from `DataFlowImplSpecific.qll` in order to
308-
* force a stage-dependency on the `DataFlowImplCommon.qll` stage and therby
308+
* force a stage-dependency on the `DataFlowImplCommon.qll` stage and thereby
309309
* collapsing the two stages.
310310
*/
311311
cached

cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private module Cached {
3737
* along the chain of addresses computed by `StoreNodeInstr.getInner` to identify field writes
3838
* and call `storeStep` accordingly (i.e., for an expression like `a.b.c = x`, we visit `c`, then
3939
* `b`, then `a`).
40-
* 2. Flow is transfered from a `WriteSideEffectInstruction` to a `StoreNodeOperand` after flow
40+
* 2. Flow is transferred from a `WriteSideEffectInstruction` to a `StoreNodeOperand` after flow
4141
* returns to a caller. Flow will then proceed to the defining instruction of the operand (because
4242
* the `StoreNodeInstr` computed by `StoreNodeOperand.getInner()` is the `StoreNode` containing
4343
* the defining instruction), and then along the chain computed by `StoreNodeInstr.getInner` like

cpp/ql/lib/semmle/code/cpp/ir/implementation/EdgeKind.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class DefaultEdge extends EdgeKind, TDefaultEdge {
6767

6868
/**
6969
* A "case" edge, representing the successor of a `Switch` instruction when the
70-
* the condition value matches a correponding `case` label.
70+
* the condition value matches a corresponding `case` label.
7171
*/
7272
class CaseEdge extends EdgeKind, TCaseEdge {
7373
string minValue;

cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/gvn/ValueNumbering.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class ValueNumber extends TValueNumber {
3434
final Instruction getAnInstruction() { this = valueNumber(result) }
3535

3636
/**
37-
* Gets one of the instructions that was assigned this value number. The chosen instuction is
37+
* Gets one of the instructions that was assigned this value number. The chosen instruction is
3838
* deterministic but arbitrary. Intended for use only in debugging.
3939
*/
4040
final Instruction getExampleInstruction() {

cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ predicate canReuseSsaForMemoryResult(Instruction instruction) {
10051005
deprecated predicate canReuseSSAForMemoryResult = canReuseSsaForMemoryResult/1;
10061006

10071007
/**
1008-
* Expose some of the internal predicates to PrintSSA.qll. We do this by publically importing those modules in the
1008+
* Expose some of the internal predicates to PrintSSA.qll. We do this by publicly importing those modules in the
10091009
* `DebugSSA` module, which is then imported by PrintSSA.
10101010
*/
10111011
module DebugSsa {

cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/gvn/ValueNumbering.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class ValueNumber extends TValueNumber {
3434
final Instruction getAnInstruction() { this = valueNumber(result) }
3535

3636
/**
37-
* Gets one of the instructions that was assigned this value number. The chosen instuction is
37+
* Gets one of the instructions that was assigned this value number. The chosen instruction is
3838
* deterministic but arbitrary. Intended for use only in debugging.
3939
*/
4040
final Instruction getExampleInstruction() {

0 commit comments

Comments
 (0)