C#: Fix an incorrect merge conflict resolution.

MathiasVP · MathiasVP · commit 9d04abbce37a · 2025-12-18T11:53:35.000Z
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/TaintedPathQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/TaintedPathQuery.qll
@@ -108,12 +108,12 @@ private module TaintedPathConfig implements DataFlow::StateConfigSig {
     s2 = Normalized()
   }
 
+  predicate isBarrier(DataFlow::Node node, FlowState state) { node.(Sanitizer).isBarrier(state) }
+
   predicate isBarrierOut(DataFlow::Node node, FlowState state) {
     isAdditionalFlowStep(_, state, node, _)
   }
 
-  predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
-
   predicate observeDiffInformedIncrementalMode() { any() }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -108,12 +108,12 @@ private module TaintedPathConfig implements DataFlow::StateConfigSig {`
`108`	`108`	`s2 = Normalized()`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ predicate isBarrier(DataFlow::Node node, FlowState state) { node.(Sanitizer).isBarrier(state) }`
	`112`	`+`
`111`	`113`	`predicate isBarrierOut(DataFlow::Node node, FlowState state) {`
`112`	`114`	`isAdditionalFlowStep(_, state, node, _)`
`113`	`115`	`}`
`114`	`116`
`115`		`- predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }`
`116`		`-`
`117`	`117`	`predicate observeDiffInformedIncrementalMode() { any() }`
`118`	`118`	`}`
`119`	`119`