Swift: use hasQualifiedName in UnsafeWebViewFetch.ql.

Author: geoffw0

swift/ql/src/queries/Security/CWE-079/UnsafeWebViewFetch.ql

@@ -27,32 +27,29 @@ class Sink extends DataFlow::Node {
 
   Sink() {
     exists(
-      AbstractFunctionDecl funcDecl, CallExpr call, string funcName, string paramName, int arg,
-      int baseUrlArg
+      MethodDecl funcDecl, CallExpr call, string className, string funcName, string paramName,
+      int arg, int baseUrlArg
     |
       // arguments to method calls...
-      exists(string className, ClassOrStructDecl c |
-        (
-          // `loadHTMLString`
-          className = ["UIWebView", "WKWebView"] and
-          funcName = "loadHTMLString(_:baseURL:)" and
-          paramName = "string"
-          or
-          // `UIWebView.load`
-          className = "UIWebView" and
-          funcName = "load(_:mimeType:textEncodingName:baseURL:)" and
-          paramName = "data"
-          or
-          // `WKWebView.load`
-          className = "WKWebView" and
-          funcName = "load(_:mimeType:characterEncodingName:baseURL:)" and
-          paramName = "data"
-        ) and
-        c.getName() = className and
-        c.getAMember() = funcDecl and
-        call.getStaticTarget() = funcDecl
+      (
+        // `loadHTMLString`
+        className = ["UIWebView", "WKWebView"] and
+        funcName = "loadHTMLString(_:baseURL:)" and
+        paramName = "string"
+        or
+        // `UIWebView.load`
+        className = "UIWebView" and
+        funcName = "load(_:mimeType:textEncodingName:baseURL:)" and
+        paramName = "data"
+        or
+        // `WKWebView.load`
+        className = "WKWebView" and
+        funcName = "load(_:mimeType:characterEncodingName:baseURL:)" and
+        paramName = "data"
       ) and
+      call.getStaticTarget() = funcDecl and
       // match up `funcName`, `paramName`, `arg`, `node`.
+      funcDecl.hasQualifiedName(className, funcName) and
       funcDecl.getName() = funcName and
       funcDecl.getParam(pragma[only_bind_into](arg)).getName() = paramName and
       call.getArgument(pragma[only_bind_into](arg)).getExpr() = this.asExpr() and