Merge pull request #1576 from rneatherway/java/is-not-empty-null-guards-1.21

yh-semmle · web-flow · commit bed1b747e74e · 2019-07-10T13:32:19.000-04:00
Java: Add `isNotEmpty` to NullGuards
diff --git a/java/ql/src/semmle/code/java/dataflow/NullGuards.qll b/java/ql/src/semmle/code/java/dataflow/NullGuards.qll
@@ -120,6 +120,14 @@ predicate nullCheckMethod(Method m, boolean branch, boolean isnull) {
   m.hasName("isBlank") and
   branch = false and
   isnull = false
+  or
+  (
+    m.getDeclaringType().hasQualifiedName("org.apache.commons.collections4", "CollectionUtils") or
+    m.getDeclaringType().hasQualifiedName("org.apache.commons.collections", "CollectionUtils")
+  ) and
+  m.hasName("isNotEmpty") and
+  branch = true and
+  isnull = false
 }
 
 /**
