Skip to content

Commit aaa2a60

Browse files
committed
[zlaski/memset-model] Remove taint tracking from Memset.qll. Add Memset.qll to Models.qll.
1 parent 144aacb commit aaa2a60

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

cpp/ql/src/semmle/code/cpp/models/Models.qll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
private import implementations.IdentityFunction
22
private import implementations.Inet
33
private import implementations.Memcpy
4+
private import implementations.Memset
45
private import implementations.Printf
56
private import implementations.Pure
67
private import implementations.Strcat

cpp/ql/src/semmle/code/cpp/models/implementations/Memset.qll

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
import semmle.code.cpp.Function
22
import semmle.code.cpp.models.interfaces.ArrayFunction
33
import semmle.code.cpp.models.interfaces.DataFlow
4-
import semmle.code.cpp.models.interfaces.Taint
54

65
/**
76
* The standard function `memset` and its assorted variants
87
*/
9-
class MemsetFunction extends ArrayFunction, DataFlowFunction, TaintFunction {
8+
class MemsetFunction extends ArrayFunction, DataFlowFunction {
109
MemsetFunction() {
1110
hasGlobalName("memset") or
11+
hasGlobalName("wmemset") or
1212
hasGlobalName("bzero") or
1313
hasGlobalName("__builtin_memset") or
14-
hasQualifiedName("std", "memset")
14+
hasGlobalName("__builtin_memset_chk") or
15+
hasQualifiedName("std", "memset") or
16+
hasQualifiedName("std", "wmemset")
1517
}
1618

1719
override predicate hasArrayOutput(int bufParam) { bufParam = 0 }

0 commit comments

Comments
 (0)