Merge pull request github#11966 from geoffw0/usenumerics

geoffw0 · web-flow · commit 25bcaa3a5415 · 2023-01-23T18:06:17.000Z
Swift: Use numeric types in CleartextLogging.qll.
diff --git a/swift/ql/lib/codeql/swift/security/CleartextLogging.qll b/swift/ql/lib/codeql/swift/security/CleartextLogging.qll
@@ -53,7 +53,8 @@ private class OsLogPrivacyCleartextLoggingSanitizer extends CleartextLoggingSani
 /** A type that isn't redacted by default in an `OSLogMessage`. */
 private class OsLogNonRedactedType extends Type {
   OsLogNonRedactedType() {
-    this.getName() = [["", "U"] + "Int" + ["", "8", "16", "32", "64"], "Double", "Float", "Bool"]
+    this instanceof NumericType or
+    this instanceof BoolType
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ private class OsLogPrivacyCleartextLoggingSanitizer extends CleartextLoggingSani`
`53`	`53`	/** A type that isn't redacted by default in an `OSLogMessage`. */
`54`	`54`	`private class OsLogNonRedactedType extends Type {`
`55`	`55`	`OsLogNonRedactedType() {`
`56`		`- this.getName() = [["", "U"] + "Int" + ["", "8", "16", "32", "64"], "Double", "Float", "Bool"]`
	`56`	`+ this instanceof NumericType or`
	`57`	`+ this instanceof BoolType`
`57`	`58`	`}`
`58`	`59`	`}`
`59`	`60`