Refactor for fear of bad optimization

github · Oct 11, 2024 · d06c822 · d06c822
1 parent 224e0c0
commit d06c822
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/java/ql/lib/semmle/code/java/dataflow/ListOfConstantsSanitizer.qll b/java/ql/lib/semmle/code/java/dataflow/ListOfConstantsSanitizer.qll
@@ -160,13 +160,14 @@ module Collection {
   private predicate noUnsafeCalls(Expr e) {
     forall(MethodCall mc, int arg, Expr x |
       DataFlow::localExprFlow(x, e) and
+      x != e and
       (
         arg = -1 and x = mc.getQualifier()
         or
         x = mc.getArgument(arg)
       )
     |
-      x = e or arg = mc.(SafeCall).getArg()
+      arg = mc.(SafeCall).getArg()
     )
   }