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

Fix errors from previous PR

Browse Source
This commit is contained in:
Owen Mansel-Chan
2021-08-16 15:53:11 +01:00
parent 1c2476c6a1
commit b23fabe8cb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/ql/src/semmle/code/java/frameworks/apache/Collections.qll
View File

@@ -5,7 +5,7 @@ private import semmle.code.java.dataflow.FlowSteps
private import semmle.code.java.dataflow.ExternalFlow private import semmle.code.java.dataflow.ExternalFlow
/** /**
* The method `isNotEmpty` in either `org.apache.commons.collections.CollectionUtils` * The method `isEmpty` in either `org.apache.commons.collections.CollectionUtils`
* or `org.apache.commons.collections4.CollectionUtils`. * or `org.apache.commons.collections4.CollectionUtils`.
*/ */
class MethodApacheCollectionsIsEmpty extends Method { class MethodApacheCollectionsIsEmpty extends Method {
@@ -146,7 +146,7 @@ private class ApacheKeyValueModel extends SummaryModelCsv {
[ [
".keyvalue;AbstractKeyValue;true;AbstractKeyValue;;;Argument[0];MapKey of Argument[-1];value", ".keyvalue;AbstractKeyValue;true;AbstractKeyValue;;;Argument[0];MapKey of Argument[-1];value",
".keyvalue;AbstractKeyValue;true;AbstractKeyValue;;;Argument[1];MapValue of Argument[-1];value", ".keyvalue;AbstractKeyValue;true;AbstractKeyValue;;;Argument[1];MapValue of Argument[-1];value",
".keyvalue;AbstractKeyValue;true;setKey;;;MapValue of Argument[-1];ReturnValue;value", ".keyvalue;AbstractKeyValue;true;setKey;;;MapKey of Argument[-1];ReturnValue;value",
".keyvalue;AbstractKeyValue;true;setKey;;;Argument[0];MapKey of Argument[-1];value", ".keyvalue;AbstractKeyValue;true;setKey;;;Argument[0];MapKey of Argument[-1];value",
".keyvalue;AbstractKeyValue;true;setValue;;;MapValue of Argument[-1];ReturnValue;value", ".keyvalue;AbstractKeyValue;true;setValue;;;MapValue of Argument[-1];ReturnValue;value",
".keyvalue;AbstractKeyValue;true;setValue;;;Argument[0];MapValue of Argument[-1];value", ".keyvalue;AbstractKeyValue;true;setValue;;;Argument[0];MapValue of Argument[-1];value",

8
java/ql/test/library-tests/frameworks/apache-collections/Test.java
View File

@@ -225,16 +225,16 @@ public class Test {
sink(getMapKey(out)); // $ hasValueFlow sink(getMapKey(out)); // $ hasValueFlow
} }
{ {
// "org.apache.commons.collections4.keyvalue;AbstractKeyValue;true;setKey;;;MapValue of Argument[-1];ReturnValue;value" // "org.apache.commons.collections4.keyvalue;AbstractKeyValue;true;setKey;;;MapKey of Argument[-1];ReturnValue;value"
Object out = null; Object out = null;
DefaultKeyValue in = newDKVWithMapValue((String)source()); DefaultKeyValue in = newDKVWithMapKey((String)source());
out = in.setKey(null); out = in.setKey(null);
sink(out); // $ hasValueFlow sink(out); // $ hasValueFlow
} }
{ {
// "org.apache.commons.collections4.keyvalue;AbstractKeyValue;true;setKey;;;MapValue of Argument[-1];ReturnValue;value" // "org.apache.commons.collections4.keyvalue;AbstractKeyValue;true;setKey;;;MapKey of Argument[-1];ReturnValue;value"
Object out = null; Object out = null;
MyAbstractKeyValue in = newMAKVWithMapValue((String)source()); MyAbstractKeyValue in = newMAKVWithMapKey((String)source());
out = in.mySetKey(null); out = in.mySetKey(null);
sink(out); // $ hasValueFlow sink(out); // $ hasValueFlow
} }