Skip to content
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

Catch JSON exceptions rather than crashing #856

Merged
merged 1 commit into from
Oct 23, 2020
Merged

Catch JSON exceptions rather than crashing #856

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
39 changes: 26 additions & 13 deletions Bugsnag/KSCrash/Source/KSCrash/Recording/Tools/BSG_KSJSONCodecObjC.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#import "BSG_KSJSONCodec.h"
#import "BSG_RFC3339DateTool.h"
#import "NSError+BSG_SimpleConstructor.h"
#import "BSG_KSLogger.h"

@interface BSG_KSJSONCodec ()

Expand Down Expand Up @@ -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
Expand All @@ -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;
Expand Down
14 changes: 10 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,20 @@ Changelog

## TBD

## Enhancements
### Bug fixes

* Catch and report unexpected exceptions when (de)serializing JSON data rather
than crashing.
[856](https://github.com/bugsnag/bugsnag-cocoa/pull/856)

### Enhancements

* Reduced the CPU and memory impact of leaving breadcrumbs.
[853](https://github.com/bugsnag/bugsnag-cocoa/pull/853)

## 6.2.2 (2020-10-21)

## Enhancements
### Enhancements

* Support "foreground" duration in MacOS as well.
[848](https://github.com/bugsnag/bugsnag-cocoa/pull/848)
Expand All @@ -25,7 +31,7 @@ Changelog

## 6.2.1 (2020-10-15)

## Bug fixes
### Bug fixes

* Changed synchronization method when responding to dynamic library image events
to a dispatch queue, which is a more bulletproof and battle-hardened approach.
Expand Down Expand Up @@ -54,7 +60,7 @@ Changelog

## 6.1.7 (2020-10-01)

## Bug fixes
### Bug fixes

* Re-enabled the `Require Only App-Extension-Safe API` build setting
[823](https://github.com/bugsnag/bugsnag-cocoa/pull/823)
Expand Down