Merge pull request #40 from mapbox/1ec5-mime-826

Don’t even try to deserialize non-JSON response data
mapbox · Oct 28, 2016 · 9294ff9 · 9294ff9
2 parents d6f162b + 0ce88ca
commit 9294ff9
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/MapboxStatic/Snapshot.swift b/MapboxStatic/Snapshot.swift
@@ -493,9 +493,13 @@ public class Snapshot: NSObject {
             var json: JSONDictionary = [:]
             var image: Image?
             if let data = data {
-                do {
-                    json = try NSJSONSerialization.JSONObjectWithData(data, options: []) as? JSONDictionary ?? json
-                } catch {
+                if response?.MIMEType == "application/json" {
+                    do {
+                        json = try NSJSONSerialization.JSONObjectWithData(data, options: []) as? JSONDictionary ?? json
+                    } catch {
+                        assert(false, "Invalid data")
+                    }
+                } else {
                     image = Image(data: data)
                 }
             }