Swift: Fix a suggestion merge conflict.

geoffw0 · geoffw0 · commit 997068a9cb1f · 2022-08-03T18:16:31.000+01:00
diff --git a/swift/ql/src/queries/Security/CWE-079/UnsafeWebViewFetch.ql b/swift/ql/src/queries/Security/CWE-079/UnsafeWebViewFetch.ql
@@ -97,7 +97,7 @@ class UnsafeWebViewFetchConfig extends TaintTracking::Configuration {
 
   override predicate isSink(DataFlow::Node node) {
     node instanceof Sink or
-    node.asExpr() = any(Sink s).getBaseURL()
+    node.asExpr() = any(Sink s).getBaseUrl()
   }
 
   override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ class UnsafeWebViewFetchConfig extends TaintTracking::Configuration {`
`97`	`97`
`98`	`98`	`override predicate isSink(DataFlow::Node node) {`
`99`	`99`	`node instanceof Sink or`
`100`		`- node.asExpr() = any(Sink s).getBaseURL()`
	`100`	`+ node.asExpr() = any(Sink s).getBaseUrl()`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {`