hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 12:46:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Amend models of MultiValueMap.addAll overloads

Browse Source
This commit is contained in:
Chris Smowton
2021-06-29 11:58:46 +01:00
parent b202110285
commit 0441098b18
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/ql/src/semmle/code/java/frameworks/spring/SpringUtil.qll
View File

@@ -58,8 +58,9 @@ private class FlowSummaries extends SummaryModelCsv {
"org.springframework.util;LinkedMultiValueMap;false;deepCopy;;;MapValue of Argument[-1];MapValue of ReturnValue;value",
"org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[-1];value",
"org.springframework.util;MultiValueMap;true;add;;;Argument[1];Element of MapValue of Argument[-1];value",
"org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value",
"org.springframework.util;MultiValueMap;true;addAll;(java.lang.Object,java.util.List);;Argument[0];MapKey of Argument[-1];value",
"org.springframework.util;MultiValueMap;true;addAll;(java.lang.Object,java.util.List);;Element of Argument[1];Element of MapValue of Argument[-1];value",
"org.springframework.util;MultiValueMap;true;addAll;(org.springframework.util.MultiValueMap);;MapKey of Argument[0];MapKey of Argument[-1];value",
"org.springframework.util;MultiValueMap;true;addAll;(org.springframework.util.MultiValueMap);;Element of MapValue of Argument[0];Element of MapValue of Argument[-1];value",
"org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[0];MapKey of Argument[-1];value",
"org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[1];Element of MapValue of Argument[-1];value",

27
java/ql/test/library-tests/frameworks/spring/util/Test.java
View File

@@ -536,20 +536,6 @@ public class Test {
out.addAll(in, null);
sink(getMapKey(out)); // $hasValueFlow
}
{
// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value"
MultiValueMapAdapter out = null;
MultiValueMap in = (MultiValueMap)source();
out.addAll(in);
sink(getMapKey(out)); // $hasValueFlow
}
{
// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value"
MultiValueMap out = null;
Object in = (Object)source();
out.addAll(in, null);
sink(getMapKey(out)); // $hasValueFlow
}
{
// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value"
MultiValueMap out = null;
@@ -557,11 +543,20 @@ public class Test {
out.addAll(in, (List)null);
sink(getMapKey(out)); // $hasValueFlow
}
{
// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value"
MultiValueMapAdapter out = null;
MultiValueMap<Object, Object> mvm = null;
mvm.set(source(), "someValue");
out.addAll(mvm);
sink(getMapKey(out)); // $hasValueFlow
}
{
// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[-1];value"
MultiValueMap out = null;
MultiValueMap in = (MultiValueMap)source();
out.addAll(in);
MultiValueMap<Object, Object> mvm = null;
mvm.set(source(), "someValue");
out.addAll(mvm);
sink(getMapKey(out)); // $hasValueFlow
}
{