Swift: Minor corrections.

Author: geoffw0

swift/ql/lib/codeql/swift/security/CleartextLoggingExtensions.qll

@@ -95,7 +95,7 @@ private class CleartextLoggingFieldAdditionalFlowStep extends CleartextLoggingAd
 
 /**
  * A function that appears to be an imported C `printf` variant.
- * TODO: merge code with similar cases from the cleartext logging PR.
+ * TODO: merge code with similar cases from the format string PR.
  */
 class PrintfFormat extends FreeFunction {
   int formatParamIndex;
@@ -144,7 +144,6 @@ private predicate logLikeHeuristic(Function f) {
 class HeuristicCleartextLoggingSink extends CleartextLoggingSink {
   HeuristicCleartextLoggingSink() {
     exists(CallExpr ce, Function f, Expr e |
-      // by function name
       logLikeHeuristic(f) and
       ce.getStaticTarget() = f and
       ce.getAnArgument().getExpr() = e and

swift/ql/test/query-tests/Security/CWE-312/cleartextLoggingTest.swift

@@ -105,7 +105,7 @@ class NSException : NSObject
 }
 
 class NSString : NSObject {
-	convenience init(string aString: String) { self.init() }
+    convenience init(string aString: String) { self.init() }
 }
 
 // from ObjC API; slightly simplified.
@@ -132,7 +132,7 @@ func logMessage(_ msg: NSString) {}
 func logInfo(_ infoMsg: String) {}
 func logError(errorMsg str: String) {}
 func harmless(_ str: String) {} // safe
-func logarithm(_ val: Float) {} // safe
+func logarithm(_ val: Float) -> Float { return 0.0 } // safe
 func doLogin(login: String) {} // safe
 
 // custom
@@ -363,7 +363,7 @@ func test7(authKey: String, authKey2: Int, authKey3: Float) {
     logInfo(authKey) // $ MISSING: hasCleartextLogging=363
     logError(errorMsg: authKey) // $ hasCleartextLogging=364
     harmless(authKey) // GOOD: not logging
-    logarithm(authKey3) // GOOD: not logging
+    _ = logarithm(authKey3) // GOOD: not logging
     doLogin(login: authKey) // GOOD: not logging
 
     let logger = LogFile()