Catch and report unexpected exceptions when (de)serializing JSON data…

… rather than crashing.
bugsnag · Oct 22, 2020 · 24d6b09 · 24d6b09
1 parent 7241891
commit 24d6b09
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 13 deletions.
diff --git a/Bugsnag/KSCrash/Source/KSCrash/Recording/Tools/BSG_KSJSONCodecObjC.m b/Bugsnag/KSCrash/Source/KSCrash/Recording/Tools/BSG_KSJSONCodecObjC.m
@@ -29,6 +29,7 @@
 #import "BSG_KSJSONCodec.h"
 #import "BSG_RFC3339DateTool.h"
 #import "NSError+BSG_SimpleConstructor.h"
+#import "BSG_KSLogger.h"
 
 @interface BSG_KSJSONCodec ()
 
@@ -487,20 +488,28 @@ int bsg_ksjsoncodecobjc_i_encodeObject(BSG_KSJSONCodec *codec, id object,
 + (NSData *)encode:(id)object
            options:(BSG_KSJSONEncodeOption)encodeOptions
              error:(NSError *__autoreleasing *)error {
-    NSMutableData *data = [NSMutableData data];
-    BSG_KSJSONEncodeContext JSONContext;
-    bsg_ksjsonbeginEncode(
-        &JSONContext, encodeOptions & BSG_KSJSONEncodeOptionPretty,
-        bsg_ksjsoncodecobjc_i_addJSONData, (__bridge void *)data);
-    BSG_KSJSONCodec *codec =
-        [self codecWithEncodeOptions:encodeOptions decodeOptions:0];
-
-    int result =
-        bsg_ksjsoncodecobjc_i_encodeObject(codec, object, NULL, &JSONContext);
-    if (error != nil) {
-        *error = codec.error;
+    @try {
+        NSMutableData *data = [NSMutableData data];
+        BSG_KSJSONEncodeContext JSONContext;
+        bsg_ksjsonbeginEncode(
+            &JSONContext, encodeOptions & BSG_KSJSONEncodeOptionPretty,
+            bsg_ksjsoncodecobjc_i_addJSONData, (__bridge void *)data);
+        BSG_KSJSONCodec *codec =
+            [self codecWithEncodeOptions:encodeOptions decodeOptions:0];
+
+        int result =
+            bsg_ksjsoncodecobjc_i_encodeObject(codec, object, NULL, &JSONContext);
+        if (error != nil) {
+            *error = codec.error;
+        }
+        return result == BSG_KSJSON_OK ? data : nil;
+    } @catch (NSException *exception) {
+        BSG_KSLOG_ERROR(@"Could not encode JSON object: %@", exception.description);
+        if (error != nil) {
+            *error = [NSError bsg_errorWithDomain:@"KSJSONCodecObjC" code:0 description:exception.description];
+        }
+        return nil;
     }
-    return result == BSG_KSJSON_OK ? data : nil;
 }
 
 + (id)decode:(NSData *)JSONData
@@ -511,6 +520,10 @@ + (id)decode:(NSData *)JSONData
     @try {
         result = [NSJSONSerialization JSONObjectWithData:JSONData options:0 error:error];
     } @catch (NSException *exception) {
+        BSG_KSLOG_ERROR(@"Could not decode JSON object: %@", exception.description);
+        if (error != nil) {
+            *error = [NSError bsg_errorWithDomain:@"KSJSONCodecObjC" code:0 description:exception.description];
+        }
         result = @{};
     }
     return result;

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+## TBD
+
+## Bug fixes
+
+* Catch and report unexpected exceptions when (de)serializing JSON data rather
+  than crashing.
+  [856](https://github.com/bugsnag/bugsnag-cocoa/pull/856)
+
 ## 6.2.2 (2020-10-21)
 
 ## Enhancements