yuzu-emu/breakpad
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change JSON serialization error check.

Browse source 
- Mac OS symupload used to check for errors in JSON serialization by
inspecting the "error" out parameter of the serialization function. Now
it checks the returned data for "nil".
- Similar change for the HTTP request that's made in the same function.

Change-Id: I86f50ef44e60ee119c302e0614b115a8d35e9b5b
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/2390753
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Nelson Billing 2020-09-09 14:39:32 -07:00
parent bdac77a801
commit 9c4671f2e3
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/common/mac/SymbolCollectorClient.m
View file

@ -202,32 +202,37 @@
NSDictionary* jsonDictionary = [NSDictionary NSDictionary* jsonDictionary = [NSDictionary
dictionaryWithObjectsAndKeys:symbolIdDictionary, @"symbol_id", type, dictionaryWithObjectsAndKeys:symbolIdDictionary, @"symbol_id", type,
@"symbol_upload_type", nil]; @"symbol_upload_type", nil];
NSError* error; NSError* error = nil;
NSData* jsonData = NSData* jsonData =
[NSJSONSerialization dataWithJSONObject:jsonDictionary [NSJSONSerialization dataWithJSONObject:jsonDictionary
options:NSJSONWritingPrettyPrinted options:NSJSONWritingPrettyPrinted
error:&error]; error:&error];
if (error) { if (jsonData == nil) {
fprintf(stdout, "Error: %s\n", [[error localizedDescription] UTF8String]);
fprintf(stdout, fprintf(stdout,
"Failed to complete upload. Could not write JSON payload.\n"); "Failed to complete upload. Could not write JSON payload.\n");
return CompleteUploadResultError; return CompleteUploadResultError;
} }
NSString* body = [[NSString alloc] initWithData:jsonData NSString* body = [[NSString alloc] initWithData:jsonData
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
HTTPSimplePostRequest* postRequest = HTTPSimplePostRequest* postRequest =
[[HTTPSimplePostRequest alloc] initWithURL:URL]; [[HTTPSimplePostRequest alloc] initWithURL:URL];
[postRequest setBody:body]; [postRequest setBody:body];
[postRequest setContentType:@"application/json"]; [postRequest setContentType:@"application/json"];
error = nil;
NSData* data = [postRequest send:&error]; NSData* data = [postRequest send:&error];
if (data == nil) {
fprintf(stdout, "Error: %s\n", [[error localizedDescription] UTF8String]);
fprintf(stdout, "Failed to complete upload URL.\n");
return CompleteUploadResultError;
}
NSString* result = [[NSString alloc] initWithData:data NSString* result = [[NSString alloc] initWithData:data
encoding:NSUTF8StringEncoding]; encoding:NSUTF8StringEncoding];
int responseCode = [[postRequest response] statusCode]; int responseCode = [[postRequest response] statusCode];
[postRequest release]; [postRequest release];
if (responseCode != 200) {
if (error || responseCode != 200) {
fprintf(stdout, "Failed to complete upload URL.\n"); fprintf(stdout, "Failed to complete upload URL.\n");
fprintf(stdout, "Response code: %d\n", responseCode); fprintf(stdout, "Response code: %d\n", responseCode);
fprintf(stdout, "Response:\n"); fprintf(stdout, "Response:\n");