From 0dc8ed1a341427a3950cfd34ad644e4d1796f371 Mon Sep 17 00:00:00 2001 From: Andreas Linde Date: Fri, 10 Feb 2012 19:40:30 +0100 Subject: [PATCH] Fix potential crash if json string is nil --- Classes/BWHockeyManager.m | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Classes/BWHockeyManager.m b/Classes/BWHockeyManager.m index eca8f6d455..fb83acd6fb 100644 --- a/Classes/BWHockeyManager.m +++ b/Classes/BWHockeyManager.m @@ -634,6 +634,9 @@ static NSString *kHockeyErrorDomain = @"HockeyErrorDomain"; NSError *error = nil; id feedResult = nil; + if (!jsonString) + return nil; + #if BW_NATIVE_JSON_AVAILABLE feedResult = [NSJSONSerialization JSONObjectWithData:[jsonString dataUsingEncoding:NSUTF8StringEncoding] options:kNilOptions error:&error]; #else @@ -648,6 +651,10 @@ static NSString *kHockeyErrorDomain = @"HockeyErrorDomain"; invocation.target = nsjsonClass; invocation.selector = nsjsonSelect; NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding]; + + if (!jsonData) + return nil; + [invocation setArgument:&jsonData atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation NSUInteger readOptions = kNilOptions; [invocation setArgument:&readOptions atIndex:3];