[Issue #206] Replacing stringByAddingPercentEncodingWithAllowedCharac…

…ters with CFURLCreateStringByAddingPercentEscapes to prevent out-of-memory exception
Alamofire · Nov 6, 2014 · 28df82e · 28df82e
1 parent 66fde65
commit 28df82e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Alamofire.swift b/Source/Alamofire.swift
@@ -152,8 +152,8 @@ public enum ParameterEncoding {
     }
 
     func escape(string: String) -> String {
-        let allowedCharacters =  NSCharacterSet(charactersInString:" =\"#%/<>?@\\^`{}[]|&+").invertedSet
-        return string.stringByAddingPercentEncodingWithAllowedCharacters(allowedCharacters) ?? string
+        let legalURLCharactersToBeEscaped: CFStringRef = ":/?&=;+!@#$()',*"
+        return CFURLCreateStringByAddingPercentEscapes(nil, string, nil, legalURLCharactersToBeEscaped, CFStringBuiltInEncodings.UTF8.rawValue)
     }
 }