Model HashMap(Map)

github · Jul 15, 2021 · 3d9808b · 3d9808b
1 parent fb43a53
commit 3d9808b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/ContainerFlow.qll b/java/ql/src/semmle/code/java/dataflow/internal/ContainerFlow.qll
@@ -132,6 +132,8 @@ private class ContainerFlowSummaries extends SummaryModelCsv {
         "java.util;Map;true;merge;(Object,Object,BiFunction);;Argument[1];MapValue of Argument[-1];value",
         "java.util;Map;true;putAll;(Map);;MapKey of Argument[0];MapKey of Argument[-1];value",
         "java.util;Map;true;putAll;(Map);;MapValue of Argument[0];MapValue of Argument[-1];value",
+        "java.util;HashMap;false;HashMap;;;MapKey of Argument[0];MapKey of Argument[-1];value",
+        "java.util;HashMap;false;HashMap;;;MapValue of Argument[0];MapValue of Argument[-1];value",
         "java.util;Collection;true;parallelStream;();;Element of Argument[-1];Element of ReturnValue;value",
         "java.util;Collection;true;stream;();;Element of Argument[-1];Element of ReturnValue;value",
         "java.util;Collection;true;toArray;;;Element of Argument[-1];ArrayElement of ReturnValue;value",

diff --git a/java/ql/test/library-tests/dataflow/collections/B.java b/java/ql/test/library-tests/dataflow/collections/B.java
@@ -232,6 +232,16 @@ void foo() throws InterruptedException {
       Map out = null;
       Object in = storeMapValue(source()); out.putAll((Map)in); sink(readMapValue(out)); // $ hasValueFlow
     }
+    {
+      // "java.util;HashMap;false;HashMap;;;MapKey of Argument[0];MapKey of Argument[-1];value",
+      HashMap out = null;
+      Map in = storeMapKey(source()); out = new HashMap(in); sink(readMapKey(out)); // $ hasValueFlow
+    }
+    {
+      // "java.util;HashMap;false;HashMap;;;MapValue of Argument[0];MapValue of Argument[-1];value",
+      HashMap out = null;
+      Map in = storeMapValue(source()); out = new HashMap(in); sink(readMapValue(out)); // $ hasValueFlow
+    }
     {
       // "java.util;Collection;true;parallelStream;();;Element of Argument[-1];Element of ReturnValue;value",
       Stream out = null;