-- Fixed JSON Deserialisation of string values with spaces at the start of string --

Author: Salman Jamil

Foundation/NSJSONSerialization.swift

@@ -306,7 +306,12 @@ private struct JSONReader {
     }
 
     func consumeStructure(ascii: UInt8, input: Index) throws -> Index? {
-        return try consumeWhitespace(input).flatMap(consumeASCII(ascii)).flatMap(consumeWhitespace)
+        switch ascii {
+        case Structure.QuotationMark:
+            return try consumeWhitespace(input).flatMap(consumeASCII(ascii)) // for strings we don't consume(ignore) the whitespaces after the starting Quotation Mark because they are part of string  e.g in "{\"title\" : \" hello world!!\" }" the value should be " hello world!!" instead of "hello world"
+        default:
+            return try consumeWhitespace(input).flatMap(consumeASCII(ascii)).flatMap(consumeWhitespace)
+        }
     }
 
     func consumeASCII(ascii: UInt8) -> (Index) throws -> Index? {

TestFoundation/TestNSJSONSerialization.swift

@@ -92,6 +92,7 @@ extension TestNSJSONSerialization {
             ("test_deserialize_emptyArray", test_deserialize_emptyArray),
             ("test_deserialize_multiStringArray", test_deserialize_multiStringArray),
             ("test_deserialize_unicodeString", test_deserialize_unicodeString),
+            ("test_deserialize_stringWithSpacesAtStart", test_deserialize_stringWithSpacesAtStart),
 
 
             ("test_deserialize_values", test_deserialize_values),
@@ -148,6 +149,23 @@ extension TestNSJSONSerialization {
         }
     }
 
+    func test_deserialize_stringWithSpacesAtStart(){
+        
+        let subject = "{\"title\" : \" hello world!!\" }"
+        do {
+            guard let data = subject.bridge().dataUsingEncoding(NSUTF8StringEncoding) else  {
+                XCTFail("Unable to convert string to data")
+                return
+            }
+            let result = try NSJSONSerialization.JSONObjectWithData(data, options: []) as? [String : Any]
+            XCTAssertEqual(result?["title"] as? String, " hello world!!")
+        } catch{
+            XCTFail("Error thrown: \(error)")
+        }
+        
+        
+    }
+    
     //MARK: - Array Deserialization
     func test_deserialize_emptyArray() {
         let subject = "[]"