[SR-391] _CFSwiftDictionaryGetKeysAndValues() crashes with NULL argum…

…ents It's valid to enumerate a dictionary with CFDictionaryGetKeysAndValues(), only retrieving the keys or values (or indeed nothing).
lhoward · Dec 29, 2015 · 6724634 · 6724634
1 parent 028cb2d
commit 6724634
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Foundation/NSCFDictionary.swift b/Foundation/NSCFDictionary.swift
@@ -139,8 +139,12 @@ internal func _CFSwiftDictionaryContainsValue(dictionary: AnyObject, value: AnyO
 internal func _CFSwiftDictionaryGetKeysAndValues(dictionary: AnyObject, keybuf: UnsafeMutablePointer<Unmanaged<AnyObject>?>, valuebuf: UnsafeMutablePointer<Unmanaged<AnyObject>?>) {
     var idx = 0
     (dictionary as! NSDictionary).enumerateKeysAndObjectsUsingBlock { key, value, _ in
-        keybuf[idx] = Unmanaged<AnyObject>.passUnretained(key)
-        valuebuf[idx] = Unmanaged<AnyObject>.passUnretained(value)
+	if keybuf != nil {
+	    keybuf[idx] = Unmanaged<AnyObject>.passUnretained(key)
+	}
+	if valuebuf != nil {
+	    valuebuf[idx] = Unmanaged<AnyObject>.passUnretained(value)
+	}
         idx += 1
     }
 }