Skip to content

Commit 904db78

Browse files
geoffw0geoffw0
committed
Merge branch 'main' into impropnull
2 parents ae35ae1 + bbbbeda commit 904db78

File tree

71 files changed

+1827
-1117
lines changed

Some content is hidden

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

71 files changed

+1827
-1117
lines changed

‎cpp/change-notes/2021-07-29-virtual-function-declaration-specifiers.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
lgtm,codescanning
2+
* Virtual function specifiers are now accessible via the new predicates on `Function` (`.isDeclaredVirtual`, `.isOverride`, and `.isFinal`).

‎cpp/ql/src/semmle/code/cpp/Function.qll

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,23 @@ class Function extends Declaration, ControlFlowNode, AccessHolder, @function {
8282
/** Holds if this function is inline. */
8383
predicate isInline() { this.hasSpecifier("inline") }
8484

85-
/** Holds if this function is virtual. */
85+
/**
86+
* Holds if this function is virtual.
87+
*
88+
* Unlike `isDeclaredVirtual()`, `isVirtual()` holds even if the function
89+
* is not explicitly declared with the `virtual` specifier.
90+
*/
8691
predicate isVirtual() { this.hasSpecifier("virtual") }
8792

93+
/** Holds if this function is declared with the `virtual` specifier. */
94+
predicate isDeclaredVirtual() { this.hasSpecifier("declared_virtual") }
95+
96+
/** Holds if this function is declared with the `override` specifier. */
97+
predicate isOverride() { this.hasSpecifier("override") }
98+
99+
/** Holds if this function is declared with the `final` specifier. */
100+
predicate isFinal() { this.hasSpecifier("final") }
101+
88102
/**
89103
* Holds if this function is deleted.
90104
* This may be because it was explicitly deleted with an `= delete`

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,12 @@ private module FieldFlow {
735735
private class FieldConfiguration extends Configuration {
736736
FieldConfiguration() { this = "FieldConfiguration" }
737737

738-
override predicate isSource(Node source) { storeStep(source, _, _) }
738+
override predicate isSource(Node source) {
739+
storeStep(source, _, _)
740+
or
741+
// Also mark `foo(a.b);` as a source when `a.b` may be overwritten by `foo`.
742+
readStep(_, _, any(Node node | node.asExpr() = source.asDefiningArgument()))
743+
}
739744

740745
override predicate isSink(Node sink) { readStep(_, _, sink) }
741746

‎cpp/ql/test/library-tests/clang_ms/element.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
| file://:0:0:0:0 | declaration of 1st parameter |
8080
| file://:0:0:0:0 | declared_constexpr |
8181
| file://:0:0:0:0 | declared_constinit |
82+
| file://:0:0:0:0 | declared_virtual |
8283
| file://:0:0:0:0 | decltype(nullptr) |
8384
| file://:0:0:0:0 | definition of fp_offset |
8485
| file://:0:0:0:0 | definition of gp_offset |
@@ -91,6 +92,7 @@
9192
| file://:0:0:0:0 | explicit |
9293
| file://:0:0:0:0 | extern |
9394
| file://:0:0:0:0 | far |
95+
| file://:0:0:0:0 | final |
9496
| file://:0:0:0:0 | float |
9597
| file://:0:0:0:0 | forceinline |
9698
| file://:0:0:0:0 | fp_offset |

‎cpp/ql/test/library-tests/conditions/elements.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
| file://:0:0:0:0 | const __va_list_tag & |
5050
| file://:0:0:0:0 | declared_constexpr |
5151
| file://:0:0:0:0 | declared_constinit |
52+
| file://:0:0:0:0 | declared_virtual |
5253
| file://:0:0:0:0 | decltype(nullptr) |
5354
| file://:0:0:0:0 | definition of <error> |
5455
| file://:0:0:0:0 | definition of fp_offset |
@@ -62,6 +63,7 @@
6263
| file://:0:0:0:0 | explicit |
6364
| file://:0:0:0:0 | extern |
6465
| file://:0:0:0:0 | far |
66+
| file://:0:0:0:0 | final |
6567
| file://:0:0:0:0 | float |
6668
| file://:0:0:0:0 | forceinline |
6769
| file://:0:0:0:0 | fp_offset |

‎cpp/ql/test/library-tests/dataflow/dataflow-tests/localFlow.expected

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,8 @@
7070
| test.cpp:391:11:391:13 | tmp | test.cpp:391:10:391:13 | & ... |
7171
| test.cpp:391:17:391:23 | source1 | test.cpp:391:10:391:13 | ref arg & ... |
7272
| test.cpp:391:17:391:23 | source1 | test.cpp:391:16:391:23 | & ... |
73+
| test.cpp:480:67:480:67 | s | test.cpp:481:21:481:21 | s |
74+
| test.cpp:480:67:480:67 | s | test.cpp:482:20:482:20 | s |
75+
| test.cpp:481:21:481:21 | s [post update] | test.cpp:482:20:482:20 | s |
76+
| test.cpp:481:24:481:30 | ref arg content | test.cpp:482:23:482:29 | content |
77+
| test.cpp:482:23:482:29 | content | test.cpp:483:9:483:17 | p_content |

‎cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,3 +470,15 @@ void viaOutparam() {
470470
intOutparamSource(&x);
471471
sink(x); // $ ast,ir
472472
}
473+
474+
void writes_to_content(void*);
475+
476+
struct MyStruct {
477+
int* content;
478+
};
479+
480+
void local_field_flow_def_by_ref_steps_with_local_flow(MyStruct * s) {
481+
writes_to_content(s->content);
482+
int* p_content = s->content;
483+
sink(*p_content);
484+
}

‎cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,9 +496,13 @@
496496
| map.cpp:49:7:49:7 | f [post update] | map.cpp:51:7:51:7 | f | |
497497
| map.cpp:49:7:49:7 | f [post update] | map.cpp:53:30:53:30 | f | |
498498
| map.cpp:49:7:49:7 | f [post update] | map.cpp:59:6:59:6 | f | |
499+
| map.cpp:49:9:49:13 | ref arg first | map.cpp:54:9:54:13 | first | |
500+
| map.cpp:49:9:49:13 | ref arg first | map.cpp:60:9:60:13 | first | |
499501
| map.cpp:50:7:50:7 | f [post update] | map.cpp:51:7:51:7 | f | |
500502
| map.cpp:50:7:50:7 | f [post update] | map.cpp:53:30:53:30 | f | |
501503
| map.cpp:50:7:50:7 | f [post update] | map.cpp:59:6:59:6 | f | |
504+
| map.cpp:50:9:50:14 | ref arg second | map.cpp:55:9:55:14 | second | |
505+
| map.cpp:50:9:50:14 | ref arg second | map.cpp:61:9:61:14 | second | |
502506
| map.cpp:53:30:53:30 | f | map.cpp:54:7:54:7 | g | |
503507
| map.cpp:53:30:53:30 | f | map.cpp:55:7:55:7 | g | |
504508
| map.cpp:53:30:53:30 | f | map.cpp:56:7:56:7 | g | |
@@ -3395,6 +3399,7 @@
33953399
| smart_pointer.cpp:125:20:125:20 | call to operator-> [post update] | smart_pointer.cpp:125:18:125:19 | ref arg p1 | TAINT |
33963400
| smart_pointer.cpp:125:22:125:22 | q | smart_pointer.cpp:125:18:125:22 | call to shared_ptr | |
33973401
| smart_pointer.cpp:125:22:125:22 | ref arg q | smart_pointer.cpp:125:22:125:22 | q [inner post update] | |
3402+
| smart_pointer.cpp:125:22:125:22 | ref arg q | smart_pointer.cpp:126:12:126:12 | q | |
33983403
| smart_pointer.cpp:126:8:126:9 | p1 | smart_pointer.cpp:126:10:126:10 | call to operator-> | |
33993404
| smart_pointer.cpp:126:8:126:9 | ref arg p1 | smart_pointer.cpp:124:48:124:49 | p1 | |
34003405
| smart_pointer.cpp:126:10:126:10 | call to operator-> [post update] | smart_pointer.cpp:126:8:126:9 | ref arg p1 | TAINT |
@@ -3432,6 +3437,7 @@
34323437
| smart_pointer.cpp:133:23:133:24 | ref arg p1 | smart_pointer.cpp:132:53:132:54 | p1 | |
34333438
| smart_pointer.cpp:133:23:133:24 | ref arg p1 | smart_pointer.cpp:134:8:134:9 | p1 | |
34343439
| smart_pointer.cpp:133:25:133:25 | call to operator-> [post update] | smart_pointer.cpp:133:23:133:24 | ref arg p1 | TAINT |
3440+
| smart_pointer.cpp:133:27:133:27 | ref arg q | smart_pointer.cpp:134:12:134:12 | q | |
34353441
| smart_pointer.cpp:134:8:134:9 | p1 | smart_pointer.cpp:134:10:134:10 | call to operator-> | |
34363442
| smart_pointer.cpp:134:8:134:9 | ref arg p1 | smart_pointer.cpp:132:53:132:54 | p1 | |
34373443
| smart_pointer.cpp:134:10:134:10 | call to operator-> [post update] | smart_pointer.cpp:134:8:134:9 | ref arg p1 | TAINT |
@@ -6435,6 +6441,7 @@
64356441
| taint.cpp:669:18:669:18 | s [post update] | taint.cpp:671:7:671:7 | s | |
64366442
| taint.cpp:669:18:669:18 | s [post update] | taint.cpp:672:7:672:7 | s | |
64376443
| taint.cpp:669:18:669:18 | s [post update] | taint.cpp:673:7:673:7 | s | |
6444+
| taint.cpp:669:20:669:20 | ref arg x | taint.cpp:672:9:672:9 | x | |
64386445
| taint.cpp:672:7:672:7 | s [post update] | taint.cpp:673:7:673:7 | s | |
64396446
| vector.cpp:16:43:16:49 | source1 | vector.cpp:17:26:17:32 | source1 | |
64406447
| vector.cpp:16:43:16:49 | source1 | vector.cpp:31:38:31:44 | source1 | |
@@ -7076,14 +7083,20 @@
70767083
| vector.cpp:198:3:198:4 | ee [post update] | vector.cpp:200:3:200:4 | ee | |
70777084
| vector.cpp:198:3:198:4 | ee [post update] | vector.cpp:201:8:201:9 | ee | |
70787085
| vector.cpp:198:3:198:4 | ee [post update] | vector.cpp:202:2:202:2 | ee | |
7086+
| vector.cpp:198:6:198:7 | ref arg vs | vector.cpp:199:11:199:12 | vs | |
7087+
| vector.cpp:198:6:198:7 | ref arg vs | vector.cpp:200:6:200:7 | vs | |
7088+
| vector.cpp:198:6:198:7 | ref arg vs | vector.cpp:201:11:201:12 | vs | |
70797089
| vector.cpp:198:19:198:19 | 0 | vector.cpp:198:6:198:7 | ref arg vs | TAINT |
70807090
| vector.cpp:199:8:199:9 | ee [post update] | vector.cpp:200:3:200:4 | ee | |
70817091
| vector.cpp:199:8:199:9 | ee [post update] | vector.cpp:201:8:201:9 | ee | |
70827092
| vector.cpp:199:8:199:9 | ee [post update] | vector.cpp:202:2:202:2 | ee | |
7093+
| vector.cpp:199:11:199:12 | ref arg vs | vector.cpp:200:6:200:7 | vs | |
7094+
| vector.cpp:199:11:199:12 | ref arg vs | vector.cpp:201:11:201:12 | vs | |
70837095
| vector.cpp:199:11:199:12 | vs | vector.cpp:199:13:199:13 | call to operator[] | TAINT |
70847096
| vector.cpp:200:3:200:4 | ee [post update] | vector.cpp:201:8:201:9 | ee | |
70857097
| vector.cpp:200:3:200:4 | ee [post update] | vector.cpp:202:2:202:2 | ee | |
70867098
| vector.cpp:200:3:200:21 | ... = ... | vector.cpp:200:8:200:8 | call to operator[] [post update] | |
7099+
| vector.cpp:200:6:200:7 | ref arg vs | vector.cpp:201:11:201:12 | vs | |
70877100
| vector.cpp:200:6:200:7 | vs | vector.cpp:200:8:200:8 | call to operator[] | TAINT |
70887101
| vector.cpp:200:8:200:8 | call to operator[] [post update] | vector.cpp:200:6:200:7 | ref arg vs | TAINT |
70897102
| vector.cpp:200:14:200:19 | call to source | vector.cpp:200:3:200:21 | ... = ... | |

‎cpp/ql/test/library-tests/specifiers2/specifiers2.expected

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@
4343
| Function | specifiers2pp.cpp:10:18:10:24 | MyClass | MyClass | public |
4444
| Function | specifiers2pp.cpp:12:14:12:22 | publicFun | publicFun | inline |
4545
| Function | specifiers2pp.cpp:12:14:12:22 | publicFun | publicFun | public |
46+
| Function | specifiers2pp.cpp:13:21:13:26 | getInt | getInt | declared_virtual |
4647
| Function | specifiers2pp.cpp:13:21:13:26 | getInt | getInt | extern |
4748
| Function | specifiers2pp.cpp:13:21:13:26 | getInt | getInt | public |
4849
| Function | specifiers2pp.cpp:13:21:13:26 | getInt | getInt | pure |
4950
| Function | specifiers2pp.cpp:13:21:13:26 | getInt | getInt | virtual |
51+
| Function | specifiers2pp.cpp:14:21:14:21 | f | f | declared_virtual |
5052
| Function | specifiers2pp.cpp:14:21:14:21 | f | f | extern |
5153
| Function | specifiers2pp.cpp:14:21:14:21 | f | f | public |
5254
| Function | specifiers2pp.cpp:14:21:14:21 | f | f | virtual |
@@ -71,6 +73,7 @@
7173
| Function | specifiers2pp.cpp:24:7:24:7 | operator= | operator= | inline |
7274
| Function | specifiers2pp.cpp:24:7:24:7 | operator= | operator= | public |
7375
| Function | specifiers2pp.cpp:24:7:24:7 | operator= | operator= | public |
76+
| Function | specifiers2pp.cpp:26:21:26:21 | f | f | declared_virtual |
7477
| Function | specifiers2pp.cpp:26:21:26:21 | f | f | extern |
7578
| Function | specifiers2pp.cpp:26:21:26:21 | f | f | override |
7679
| Function | specifiers2pp.cpp:26:21:26:21 | f | f | public |

‎cpp/ql/test/library-tests/templates/instantiations_functions/elements.expected

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
| file://:0:0:0:0 | declaration of 1st parameter |
110110
| file://:0:0:0:0 | declared_constexpr |
111111
| file://:0:0:0:0 | declared_constinit |
112+
| file://:0:0:0:0 | declared_virtual |
112113
| file://:0:0:0:0 | decltype(nullptr) |
113114
| file://:0:0:0:0 | definition of fp_offset |
114115
| file://:0:0:0:0 | definition of gp_offset |
@@ -121,6 +122,7 @@
121122
| file://:0:0:0:0 | explicit |
122123
| file://:0:0:0:0 | extern |
123124
| file://:0:0:0:0 | far |
125+
| file://:0:0:0:0 | final |
124126
| file://:0:0:0:0 | float |
125127
| file://:0:0:0:0 | forceinline |
126128
| file://:0:0:0:0 | fp_offset |

0 commit comments

Comments
 (0)