Skip to content

[SR-2694] Cannot JSON serialize array with boolean value #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phausler merged 1 commit into from
Sep 28, 2016
Merged

[SR-2694] Cannot JSON serialize array with boolean value #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Foundation/NSJSONSerialization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ open class JSONSerialization : NSObject {
}

// object is NSNumber and is not NaN or infinity
if let number = obj as? NSNumber {
if let number = _SwiftValue.store(obj) as? NSNumber {
let invalid = number.doubleValue.isInfinite || number.doubleValue.isNaN
return !invalid
}
Expand Down Expand Up @@ -285,6 +285,8 @@ private struct JSONWriter {
try serializeDictionary(dict)
} else if let null = obj as? NSNull {
try serializeNull(null)
} else if let boolVal = obj as? Bool {
try serializeNumber(NSNumber(value: boolVal))
}
else {
throw NSError(domain: NSCocoaErrorDomain, code: CocoaError.propertyListReadCorrupt.rawValue, userInfo: ["NSDebugDescription" : "Invalid object cannot be serialized"])
Expand Down
11 changes: 11 additions & 0 deletions TestFoundation/TestNSJSONSerialization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,7 @@ extension TestNSJSONSerialization {
("test_jsonObjectToOutputStreamFile", test_jsonObjectToOutputStreamFile),
("test_invalidJsonObjectToStreamBuffer", test_invalidJsonObjectToStreamBuffer),
("test_jsonObjectToOutputStreamInsufficeintBuffer", test_jsonObjectToOutputStreamInsufficeintBuffer),
("test_booleanJSONObject", test_booleanJSONObject),
]
}

Expand Down Expand Up @@ -928,6 +929,16 @@ extension TestNSJSONSerialization {
XCTAssertThrowsError(try JSONSerialization.writeJSONObject(str, toStream: outputStream, options: []))
}

func test_booleanJSONObject() {
do {
let mydata = try JSONSerialization.data(withJSONObject: [true])
XCTAssertEqual(String(data: mydata, encoding: String.Encoding.utf8), "[1]")
} catch {
XCTFail("Failed during serialization")
}
XCTAssertTrue(JSONSerialization.isValidJSONObject([1]))
}

private func createTestFile(_ path: String,_contents: Data) -> String? {
let tempDir = "/tmp/TestFoundation_Playground_" + NSUUID().uuidString + "/"
do {
Expand Down