hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 03:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into mergeback-2020-05-19

Browse Source 
Conflicts:
	cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/tainted.expected
	cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/test_diff.expected
This commit is contained in:
Jonas Jensen
2020-05-19 17:44:15 +02:00
parent 5318d42c4f 26dfca80f6
commit d38700a87c
28 changed files with 73 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cpp/ql/test/library-tests/dataflow/DefaultTaintTracking/defaulttainttracking.cpp
View File

@@ -99,21 +99,21 @@ void test_outparams() {
}
void *memcpy(void *dst, void *src, int size);
struct ContainsArray {
int arr[16];
struct XY {
int x;
int y;
};
void taint_array(ContainsArray *ca, int offset) {
void taint_y(XY *xyp) {
int tainted = getenv("VAR")[0];
memcpy(ca->arr + offset, &tainted, sizeof(int));
xyp->y = tainted;
}
void test_conflated_fields3(int arbitrary) {
ContainsArray ca;
ca.x = 0;
taint_array(&ca, arbitrary);
sink(ca.x); // not tainted [FALSE POSITIVE]
void test_conflated_fields3() {
XY xy;
xy.x = 0;
taint_y(&xy);
sink(xy.x); // not tainted [FALSE POSITIVE]
}