Issue #135: Fixes bug that causes app to crash while trying to parse …

…JSON using invalid encoding
mmattozzi · Nov 30, 2017 · 874e5e0 · 874e5e0
1 parent cae8557
commit 874e5e0
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/core/MainWindowController.m b/core/MainWindowController.m
@@ -652,9 +652,15 @@ - (void)prettyPrintJsonResponseFromString:(NSData*)jsonData {
     };
 
     id parser = [SBJson4Parser parserWithBlock:block allowMultiRoot:NO unwrapRootArray:NO errorHandler:eh];
-    SBJson4ParserStatus parseStatus = [parser parse:jsonData];
-    if (parseStatus == SBJson4ParserWaitingForData) {
-        NSLog(@"Unexpected end of JSON content");
+    @try {
+        SBJson4ParserStatus parseStatus = [parser parse:jsonData];
+        if (parseStatus == SBJson4ParserWaitingForData) {
+            NSLog(@"Unexpected end of JSON content");
+            [self printResponsePlain];
+        }
+    }
+    @catch (NSException *exception) {
+        NSLog(@"Unexpected error parsing JSON content");
         [self printResponsePlain];
     }
 }