Merge pull request github#7691 from atorralba/atorralba/fix-recursion-entrypointfieldstep

atorralba · web-flow · commit 0846d1f7b63c · 2022-01-21T11:37:58.000+01:00
Java: Fix recursion in `entrypointFieldStep`
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
@@ -92,8 +92,6 @@ private module Cached {
     )
     or
     FlowSummaryImpl::Private::Steps::summaryLocalStep(src, sink, false)
-    or
-    entrypointFieldStep(src, sink)
   }
 
   /**
@@ -103,6 +101,7 @@ private module Cached {
   cached
   predicate defaultAdditionalTaintStep(DataFlow::Node src, DataFlow::Node sink) {
     localAdditionalTaintStep(src, sink) or
+    entrypointFieldStep(src, sink) or
     any(AdditionalTaintStep a).step(src, sink)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,6 @@ private module Cached {`
`92`	`92`	`)`
`93`	`93`	`or`
`94`	`94`	`FlowSummaryImpl::Private::Steps::summaryLocalStep(src, sink, false)`
`95`		`- or`
`96`		`- entrypointFieldStep(src, sink)`
`97`	`95`	`}`
`98`	`96`
`99`	`97`	`/**`
`@@ -103,6 +101,7 @@ private module Cached {`
`103`	`101`	`cached`
`104`	`102`	`predicate defaultAdditionalTaintStep(DataFlow::Node src, DataFlow::Node sink) {`
`105`	`103`	`localAdditionalTaintStep(src, sink) or`
	`104`	`+ entrypointFieldStep(src, sink) or`
`106`	`105`	`any(AdditionalTaintStep a).step(src, sink)`
`107`	`106`	`}`
`108`	`107`