Merge pull request github#11715 from geoffw0/jsevalcleanup

MathiasVP · web-flow · commit 801f4bc8a377 · 2022-12-15T17:35:49.000Z
diff --git a/swift/ql/src/queries/Security/CWE-094/UnsafeJsEval.ql b/swift/ql/src/queries/Security/CWE-094/UnsafeJsEval.ql
@@ -127,9 +127,6 @@ class UnsafeJsEvalConfig extends TaintTracking::Configuration {
     )
     or
     exists(MemberRefExpr e, Expr self, VarDecl member |
-      self.getType().getName() = "String" and
-      member.getName() = ["utf8", "utf16", "utf8CString"]
-      or
       self.getType().getName().matches(["Unsafe%Buffer%", "Unsafe%Pointer%"]) and
       member.getName() = "baseAddress"
     |

Original file line number	Diff line number	Diff line change
`@@ -127,9 +127,6 @@ class UnsafeJsEvalConfig extends TaintTracking::Configuration {`
`127`	`127`	`)`
`128`	`128`	`or`
`129`	`129`	`exists(MemberRefExpr e, Expr self, VarDecl member \|`
`130`		`- self.getType().getName() = "String" and`
`131`		`- member.getName() = ["utf8", "utf16", "utf8CString"]`
`132`		`- or`
`133`	`130`	`self.getType().getName().matches(["Unsafe%Buffer%", "Unsafe%Pointer%"]) and`
`134`	`131`	`member.getName() = "baseAddress"`
`135`	`132`	`\|`