@@ -51,11 +51,6 @@ module MakeImplContentDataFlow<LocationSig Location, InputSig<Location> Lang> {
5151 */
5252 default predicate isAdditionalFlowStep ( Node node1 , Node node2 ) { none ( ) }
5353
54- /**
55- * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow steps.
56- */
57- default predicate isAdditionalTaintStep ( Node node1 , Node node2 ) { none ( ) }
58-
5954 /** Holds if data flow into `node` is prohibited. */
6055 default predicate isBarrier ( Node node ) { none ( ) }
6156
@@ -106,11 +101,9 @@ module MakeImplContentDataFlow<LocationSig Location, InputSig<Location> Lang> {
106101 predicate isAdditionalFlowStep ( Node node1 , FlowState state1 , Node node2 , FlowState state2 ) {
107102 storeStep ( node1 , state1 , _, node2 , state2 ) or
108103 readStep ( node1 , state1 , _, node2 , state2 ) or
109- additionalTaintStep ( node1 , state1 , node2 , state2 )
104+ additionalStep ( node1 , state1 , node2 , state2 )
110105 }
111106
112- predicate isAdditionalFlowStep = ContentConfig:: isAdditionalFlowStep / 2 ;
113-
114107 predicate isBarrier = ContentConfig:: isBarrier / 1 ;
115108
116109 FlowFeature getAFeature ( ) { result = ContentConfig:: getAFeature ( ) }
@@ -234,8 +227,8 @@ module MakeImplContentDataFlow<LocationSig Location, InputSig<Location> Lang> {
234227 )
235228 }
236229
237- private predicate additionalTaintStep ( Node node1 , State state1 , Node node2 , State state2 ) {
238- ContentConfig:: isAdditionalTaintStep ( node1 , node2 ) and
230+ private predicate additionalStep ( Node node1 , State state1 , Node node2 , State state2 ) {
231+ ContentConfig:: isAdditionalFlowStep ( node1 , node2 ) and
239232 (
240233 state1 instanceof InitState and
241234 state2 .( InitState ) .decode ( false )
0 commit comments