Skip to content

Commit 43b6103

Browse files
committed
Drop Map.merge as taint step
1 parent 0d33a77 commit 43b6103

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

java/ql/src/semmle/code/java/dataflow/internal/ContainerFlow.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private predicate taintPreservingQualifierToMethod(Method m) {
112112
// java.util.Map
113113
m
114114
.(MapMethod)
115-
.hasName(["computeIfAbsent", "entrySet", "get", "getOrDefault", "merge", "put", "putIfAbsent",
115+
.hasName(["computeIfAbsent", "entrySet", "get", "getOrDefault", "put", "putIfAbsent",
116116
"remove", "replace", "values"])
117117
or
118118
// java.util.Collection

java/ql/test/library-tests/dataflow/collections/flow.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
| ContainterTest.java:43:4:43:26 | map | ContainterTest.java:162:8:162:21 | entrySet(...) |
6262
| ContainterTest.java:43:4:43:26 | map | ContainterTest.java:163:8:163:21 | get(...) |
6363
| ContainterTest.java:43:4:43:26 | map | ContainterTest.java:164:8:164:41 | getOrDefault(...) |
64-
| ContainterTest.java:43:4:43:26 | map | ContainterTest.java:165:8:165:50 | merge(...) |
6564
| ContainterTest.java:43:4:43:26 | map | ContainterTest.java:166:8:166:30 | put(...) |
6665
| ContainterTest.java:43:4:43:26 | map | ContainterTest.java:167:8:167:38 | putIfAbsent(...) |
6766
| ContainterTest.java:43:4:43:26 | map | ContainterTest.java:168:8:168:27 | remove(...) |

0 commit comments

Comments
 (0)