Refactor for fear of bad optimization

owen-mc · owen-mc · commit d06c8222e306 · 2024-10-11T19:41:40.000+01:00
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()
     )
   }
 

Original file line number	Diff line number	Diff line change
`@@ -160,13 +160,14 @@ module Collection {`
`160`	`160`	`private predicate noUnsafeCalls(Expr e) {`
`161`	`161`	`forall(MethodCall mc, int arg, Expr x \|`
`162`	`162`	`DataFlow::localExprFlow(x, e) and`
	`163`	`+ x != e and`
`163`	`164`	`(`
`164`	`165`	`arg = -1 and x = mc.getQualifier()`
`165`	`166`	`or`
`166`	`167`	`x = mc.getArgument(arg)`
`167`	`168`	`)`
`168`	`169`	`\|`
`169`		`- x = e or arg = mc.(SafeCall).getArg()`
	`170`	`+ arg = mc.(SafeCall).getArg()`
`170`	`171`	`)`
`171`	`172`	`}`
`172`	`173`