mirror of
https://github.com/github/codeql.git
synced 2026-04-28 10:15:14 +02:00
Merge remote-tracking branch 'upstream/master' into dataflow-ref-parameter
I've accepted the new test output, which shows that this branch fixes two false negatives in the test cases from #2088.
This commit is contained in:
Jonas Jensen
12
cpp/ql/test/duplication-tests/constants/constants.cpp
Normal file
12
cpp/ql/test/duplication-tests/constants/constants.cpp
Normal file
@@ -0,0 +1,12 @@
|
||||
|
||||
int x = int();
|
||||
float y = float();
|
||||
double z = double();
|
||||
|
||||
/* This produces a getValueText() of 0 for R() in line 9, which is debatable. */
|
||||
struct R {};
|
||||
struct S {
|
||||
S() : S(R()) { }
|
||||
S(R) { }
|
||||
};
|
||||
S s;
|
||||
4
cpp/ql/test/duplication-tests/constants/expr.expected
Normal file
4
cpp/ql/test/duplication-tests/constants/expr.expected
Normal file
@@ -0,0 +1,4 @@
|
||||
| constants.cpp:2:9:2:13 | 0 | int() |
|
||||
| constants.cpp:3:11:3:17 | 0.0 | float() |
|
||||
| constants.cpp:4:12:4:19 | 0.0 | double() |
|
||||
| constants.cpp:9:11:9:13 | 0 | 0 |
|
||||
4
cpp/ql/test/duplication-tests/constants/expr.ql
Normal file
4
cpp/ql/test/duplication-tests/constants/expr.ql
Normal file
@@ -0,0 +1,4 @@
|
||||
import cpp
|
||||
|
||||
from Expr e
|
||||
select e, e.getValueText()
|
||||
@@ -235,3 +235,92 @@
|
||||
| taint.cpp:258:7:258:12 | call to source | taint.cpp:255:35:255:35 | c | |
|
||||
| taint.cpp:258:7:258:12 | call to source | taint.cpp:258:3:258:14 | ... = ... | |
|
||||
| taint.cpp:260:10:260:10 | ref arg w | taint.cpp:261:7:261:7 | w | |
|
||||
| taint.cpp:266:12:266:12 | x | taint.cpp:268:9:268:9 | x | |
|
||||
| taint.cpp:275:6:275:11 | call to source | taint.cpp:275:2:275:13 | ... = ... | |
|
||||
| taint.cpp:275:6:275:11 | call to source | taint.cpp:280:7:280:7 | t | |
|
||||
| taint.cpp:275:6:275:11 | call to source | taint.cpp:285:9:285:9 | t | |
|
||||
| taint.cpp:275:6:275:11 | call to source | taint.cpp:286:12:286:12 | t | |
|
||||
| taint.cpp:275:6:275:11 | call to source | taint.cpp:289:7:289:7 | t | |
|
||||
| taint.cpp:276:6:276:6 | 0 | taint.cpp:276:2:276:6 | ... = ... | |
|
||||
| taint.cpp:276:6:276:6 | 0 | taint.cpp:281:7:281:7 | x | |
|
||||
| taint.cpp:277:6:277:6 | 0 | taint.cpp:277:2:277:6 | ... = ... | |
|
||||
| taint.cpp:277:6:277:6 | 0 | taint.cpp:282:7:282:7 | y | |
|
||||
| taint.cpp:278:6:278:6 | 0 | taint.cpp:278:2:278:6 | ... = ... | |
|
||||
| taint.cpp:278:6:278:6 | 0 | taint.cpp:283:7:283:7 | z | |
|
||||
| taint.cpp:278:6:278:6 | 0 | taint.cpp:287:9:287:9 | z | |
|
||||
| taint.cpp:285:6:285:7 | call to id | taint.cpp:285:2:285:10 | ... = ... | |
|
||||
| taint.cpp:285:6:285:7 | call to id | taint.cpp:290:7:290:7 | x | |
|
||||
| taint.cpp:286:6:286:7 | call to id | taint.cpp:286:2:286:14 | ... = ... | |
|
||||
| taint.cpp:286:6:286:7 | call to id | taint.cpp:291:7:291:7 | y | |
|
||||
| taint.cpp:287:6:287:7 | call to id | taint.cpp:287:2:287:10 | ... = ... | |
|
||||
| taint.cpp:287:6:287:7 | call to id | taint.cpp:292:7:292:7 | z | |
|
||||
| taint.cpp:297:29:297:29 | b | taint.cpp:297:29:297:29 | b | |
|
||||
| taint.cpp:297:29:297:29 | b | taint.cpp:299:6:299:6 | b | |
|
||||
| taint.cpp:299:6:299:6 | b | taint.cpp:297:21:297:21 | a | |
|
||||
| taint.cpp:299:6:299:6 | b | taint.cpp:299:2:299:6 | ... = ... | |
|
||||
| taint.cpp:302:28:302:28 | b | taint.cpp:304:6:304:6 | b | |
|
||||
| taint.cpp:304:6:304:6 | b | taint.cpp:302:21:302:21 | a | |
|
||||
| taint.cpp:304:6:304:6 | b | taint.cpp:304:2:304:6 | ... = ... | |
|
||||
| taint.cpp:307:21:307:21 | a | taint.cpp:309:3:309:3 | a | |
|
||||
| taint.cpp:307:28:307:28 | b | taint.cpp:309:7:309:7 | b | |
|
||||
| taint.cpp:309:3:309:3 | a | taint.cpp:309:2:309:3 | * ... | TAINT |
|
||||
| taint.cpp:309:7:309:7 | b | taint.cpp:309:2:309:7 | ... = ... | |
|
||||
| taint.cpp:312:21:312:21 | a | taint.cpp:317:3:317:3 | a | |
|
||||
| taint.cpp:312:28:312:28 | b | taint.cpp:316:6:316:6 | b | |
|
||||
| taint.cpp:316:6:316:6 | b | taint.cpp:316:6:316:10 | ... + ... | TAINT |
|
||||
| taint.cpp:316:6:316:10 | ... + ... | taint.cpp:316:2:316:10 | ... = ... | |
|
||||
| taint.cpp:316:6:316:10 | ... + ... | taint.cpp:317:7:317:7 | c | |
|
||||
| taint.cpp:316:10:316:10 | 1 | taint.cpp:316:6:316:10 | ... + ... | TAINT |
|
||||
| taint.cpp:317:3:317:3 | a | taint.cpp:317:2:317:3 | * ... | TAINT |
|
||||
| taint.cpp:317:7:317:7 | c | taint.cpp:317:2:317:7 | ... = ... | |
|
||||
| taint.cpp:320:23:320:23 | a | taint.cpp:322:6:322:6 | a | |
|
||||
| taint.cpp:320:31:320:31 | b | taint.cpp:323:6:323:6 | b | |
|
||||
| taint.cpp:322:6:322:6 | a | taint.cpp:322:6:322:10 | ... + ... | TAINT |
|
||||
| taint.cpp:322:6:322:10 | ... + ... | taint.cpp:320:23:320:23 | a | |
|
||||
| taint.cpp:322:6:322:10 | ... + ... | taint.cpp:322:2:322:10 | ... = ... | |
|
||||
| taint.cpp:322:10:322:10 | 1 | taint.cpp:322:6:322:10 | ... + ... | TAINT |
|
||||
| taint.cpp:323:6:323:6 | b | taint.cpp:323:6:323:10 | ... + ... | TAINT |
|
||||
| taint.cpp:323:6:323:10 | ... + ... | taint.cpp:320:31:320:31 | b | |
|
||||
| taint.cpp:323:6:323:10 | ... + ... | taint.cpp:323:2:323:10 | ... = ... | |
|
||||
| taint.cpp:323:10:323:10 | 1 | taint.cpp:323:6:323:10 | ... + ... | TAINT |
|
||||
| taint.cpp:330:6:330:11 | call to source | taint.cpp:330:2:330:13 | ... = ... | |
|
||||
| taint.cpp:330:6:330:11 | call to source | taint.cpp:337:7:337:7 | t | |
|
||||
| taint.cpp:330:6:330:11 | call to source | taint.cpp:344:15:344:15 | t | |
|
||||
| taint.cpp:330:6:330:11 | call to source | taint.cpp:345:15:345:15 | t | |
|
||||
| taint.cpp:330:6:330:11 | call to source | taint.cpp:346:16:346:16 | t | |
|
||||
| taint.cpp:330:6:330:11 | call to source | taint.cpp:347:16:347:16 | t | |
|
||||
| taint.cpp:330:6:330:11 | call to source | taint.cpp:348:17:348:17 | t | |
|
||||
| taint.cpp:330:6:330:11 | call to source | taint.cpp:350:7:350:7 | t | |
|
||||
| taint.cpp:331:6:331:6 | 0 | taint.cpp:331:2:331:6 | ... = ... | |
|
||||
| taint.cpp:331:6:331:6 | 0 | taint.cpp:338:7:338:7 | a | |
|
||||
| taint.cpp:331:6:331:6 | 0 | taint.cpp:344:12:344:12 | a | |
|
||||
| taint.cpp:331:6:331:6 | 0 | taint.cpp:351:7:351:7 | a | |
|
||||
| taint.cpp:332:6:332:6 | 0 | taint.cpp:332:2:332:6 | ... = ... | |
|
||||
| taint.cpp:332:6:332:6 | 0 | taint.cpp:339:7:339:7 | b | |
|
||||
| taint.cpp:332:6:332:6 | 0 | taint.cpp:345:12:345:12 | b | |
|
||||
| taint.cpp:332:6:332:6 | 0 | taint.cpp:352:7:352:7 | b | |
|
||||
| taint.cpp:333:6:333:6 | 0 | taint.cpp:333:2:333:6 | ... = ... | |
|
||||
| taint.cpp:333:6:333:6 | 0 | taint.cpp:340:7:340:7 | c | |
|
||||
| taint.cpp:333:6:333:6 | 0 | taint.cpp:346:13:346:13 | c | |
|
||||
| taint.cpp:333:6:333:6 | 0 | taint.cpp:353:7:353:7 | c | |
|
||||
| taint.cpp:334:6:334:6 | 0 | taint.cpp:334:2:334:6 | ... = ... | |
|
||||
| taint.cpp:334:6:334:6 | 0 | taint.cpp:341:7:341:7 | d | |
|
||||
| taint.cpp:334:6:334:6 | 0 | taint.cpp:347:13:347:13 | d | |
|
||||
| taint.cpp:334:6:334:6 | 0 | taint.cpp:354:7:354:7 | d | |
|
||||
| taint.cpp:335:6:335:6 | 0 | taint.cpp:335:2:335:6 | ... = ... | |
|
||||
| taint.cpp:335:6:335:6 | 0 | taint.cpp:342:7:342:7 | e | |
|
||||
| taint.cpp:335:6:335:6 | 0 | taint.cpp:348:14:348:14 | e | |
|
||||
| taint.cpp:335:6:335:6 | 0 | taint.cpp:355:7:355:7 | e | |
|
||||
| taint.cpp:344:12:344:12 | ref arg a | taint.cpp:351:7:351:7 | a | |
|
||||
| taint.cpp:344:15:344:15 | ref arg t | taint.cpp:345:15:345:15 | t | |
|
||||
| taint.cpp:344:15:344:15 | ref arg t | taint.cpp:346:16:346:16 | t | |
|
||||
| taint.cpp:344:15:344:15 | ref arg t | taint.cpp:347:16:347:16 | t | |
|
||||
| taint.cpp:344:15:344:15 | ref arg t | taint.cpp:348:17:348:17 | t | |
|
||||
| taint.cpp:344:15:344:15 | ref arg t | taint.cpp:350:7:350:7 | t | |
|
||||
| taint.cpp:345:12:345:12 | ref arg b | taint.cpp:352:7:352:7 | b | |
|
||||
| taint.cpp:346:12:346:13 | ref arg & ... | taint.cpp:353:7:353:7 | c | |
|
||||
| taint.cpp:346:13:346:13 | c | taint.cpp:346:12:346:13 | & ... | |
|
||||
| taint.cpp:347:12:347:13 | ref arg & ... | taint.cpp:354:7:354:7 | d | |
|
||||
| taint.cpp:347:13:347:13 | d | taint.cpp:347:12:347:13 | & ... | |
|
||||
| taint.cpp:348:14:348:14 | ref arg e | taint.cpp:355:7:355:7 | e | |
|
||||
| taint.cpp:348:17:348:17 | ref arg t | taint.cpp:350:7:350:7 | t | |
|
||||
|
||||
@@ -260,3 +260,97 @@ void test_lambdas()
|
||||
e(t, u, w);
|
||||
sink(w); // tainted
|
||||
}
|
||||
|
||||
// --- taint through return value ---
|
||||
|
||||
int id(int x)
|
||||
{
|
||||
return x;
|
||||
}
|
||||
|
||||
void test_return()
|
||||
{
|
||||
int x, y, z, t;
|
||||
|
||||
t = source();
|
||||
x = 0;
|
||||
y = 0;
|
||||
z = 0;
|
||||
|
||||
sink(t); // tainted
|
||||
sink(x);
|
||||
sink(y);
|
||||
sink(z);
|
||||
|
||||
x = id(t);
|
||||
y = id(id(t));
|
||||
z = id(z);
|
||||
|
||||
sink(t); // tainted
|
||||
sink(x); // tainted
|
||||
sink(y); // tainted
|
||||
sink(z);
|
||||
}
|
||||
|
||||
// --- taint through parameters ---
|
||||
|
||||
void myAssign1(int &a, int &b)
|
||||
{
|
||||
a = b;
|
||||
}
|
||||
|
||||
void myAssign2(int &a, int b)
|
||||
{
|
||||
a = b;
|
||||
}
|
||||
|
||||
void myAssign3(int *a, int b)
|
||||
{
|
||||
*a = b;
|
||||
}
|
||||
|
||||
void myAssign4(int *a, int b)
|
||||
{
|
||||
int c;
|
||||
|
||||
c = b + 1;
|
||||
*a = c;
|
||||
}
|
||||
|
||||
void myNotAssign(int &a, int &b)
|
||||
{
|
||||
a = a + 1;
|
||||
b = b + 1;
|
||||
}
|
||||
|
||||
void test_outparams()
|
||||
{
|
||||
int t, a, b, c, d, e;
|
||||
|
||||
t = source();
|
||||
a = 0;
|
||||
b = 0;
|
||||
c = 0;
|
||||
d = 0;
|
||||
e = 0;
|
||||
|
||||
sink(t); // tainted
|
||||
sink(a);
|
||||
sink(b);
|
||||
sink(c);
|
||||
sink(d);
|
||||
sink(e);
|
||||
|
||||
myAssign1(a, t);
|
||||
myAssign2(b, t);
|
||||
myAssign3(&c, t);
|
||||
myAssign4(&d, t);
|
||||
myNotAssign(e, t);
|
||||
|
||||
sink(t); // tainted
|
||||
sink(a); // tainted
|
||||
sink(b); // tainted
|
||||
sink(c); // tainted [NOT DETECTED]
|
||||
sink(d); // tainted [NOT DETECTED]
|
||||
sink(e);
|
||||
}
|
||||
|
||||
@@ -29,3 +29,11 @@
|
||||
| taint.cpp:250:8:250:8 | a | taint.cpp:223:10:223:15 | call to source |
|
||||
| taint.cpp:256:8:256:8 | a | taint.cpp:223:10:223:15 | call to source |
|
||||
| taint.cpp:261:7:261:7 | w | taint.cpp:258:7:258:12 | call to source |
|
||||
| taint.cpp:280:7:280:7 | t | taint.cpp:275:6:275:11 | call to source |
|
||||
| taint.cpp:289:7:289:7 | t | taint.cpp:275:6:275:11 | call to source |
|
||||
| taint.cpp:290:7:290:7 | x | taint.cpp:275:6:275:11 | call to source |
|
||||
| taint.cpp:291:7:291:7 | y | taint.cpp:275:6:275:11 | call to source |
|
||||
| taint.cpp:337:7:337:7 | t | taint.cpp:330:6:330:11 | call to source |
|
||||
| taint.cpp:350:7:350:7 | t | taint.cpp:330:6:330:11 | call to source |
|
||||
| taint.cpp:351:7:351:7 | a | taint.cpp:330:6:330:11 | call to source |
|
||||
| taint.cpp:352:7:352:7 | b | taint.cpp:330:6:330:11 | call to source |
|
||||
|
||||
@@ -22,3 +22,6 @@
|
||||
| taint.cpp:250:8:250:8 | taint.cpp:223:10:223:15 | AST only |
|
||||
| taint.cpp:256:8:256:8 | taint.cpp:223:10:223:15 | AST only |
|
||||
| taint.cpp:261:7:261:7 | taint.cpp:258:7:258:12 | AST only |
|
||||
| taint.cpp:350:7:350:7 | taint.cpp:330:6:330:11 | AST only |
|
||||
| taint.cpp:351:7:351:7 | taint.cpp:330:6:330:11 | AST only |
|
||||
| taint.cpp:352:7:352:7 | taint.cpp:330:6:330:11 | AST only |
|
||||
|
||||
@@ -9,3 +9,8 @@
|
||||
| taint.cpp:167:8:167:13 | Call: call to source | taint.cpp:167:8:167:13 | Call: call to source |
|
||||
| taint.cpp:168:8:168:14 | Load: tainted | taint.cpp:164:19:164:24 | Call: call to source |
|
||||
| taint.cpp:210:7:210:7 | Load: x | taint.cpp:207:6:207:11 | Call: call to source |
|
||||
| taint.cpp:280:7:280:7 | Load: t | taint.cpp:275:6:275:11 | Call: call to source |
|
||||
| taint.cpp:289:7:289:7 | Load: t | taint.cpp:275:6:275:11 | Call: call to source |
|
||||
| taint.cpp:290:7:290:7 | Load: x | taint.cpp:275:6:275:11 | Call: call to source |
|
||||
| taint.cpp:291:7:291:7 | Load: y | taint.cpp:275:6:275:11 | Call: call to source |
|
||||
| taint.cpp:337:7:337:7 | Load: t | taint.cpp:330:6:330:11 | Call: call to source |
|
||||
|
||||
Reference in New Issue
Block a user