evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #251 from AquaGeek/null-error-pointer-fix

Browse source 
Check for null error pointer before setting it on the invocation
This commit is contained in:
Mattt Thompson 2012-03-16 11:45:04 -07:00
commit d6b97d4b14
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
AFNetworking/AFJSONUtilities.m
View file

@ -48,7 +48,9 @@ NSData * AFJSONEncode(id object, NSError **error) {
NSUInteger serializeOptionFlags = 0; NSUInteger serializeOptionFlags = 0;
[invocation setArgument:&serializeOptionFlags atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation [invocation setArgument:&serializeOptionFlags atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation
if (error != NULL) {
[invocation setArgument:error atIndex:3]; [invocation setArgument:error atIndex:3];
}
[invocation invoke]; [invocation invoke];
[invocation getReturnValue:&data]; [invocation getReturnValue:&data];
@ -99,7 +101,9 @@ NSData * AFJSONEncode(id object, NSError **error) {
[invocation setArgument:&object atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation [invocation setArgument:&object atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation
NSUInteger writeOptions = 0; NSUInteger writeOptions = 0;
[invocation setArgument:&writeOptions atIndex:3]; [invocation setArgument:&writeOptions atIndex:3];
if (error != NULL) {
[invocation setArgument:error atIndex:4]; [invocation setArgument:error atIndex:4];
}
[invocation invoke]; [invocation invoke];
[invocation getReturnValue:&data]; [invocation getReturnValue:&data];
@ -138,7 +142,9 @@ id AFJSONDecode(NSData *data, NSError **error) {
NSUInteger parseOptionFlags = 0; NSUInteger parseOptionFlags = 0;
[invocation setArgument:&parseOptionFlags atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation [invocation setArgument:&parseOptionFlags atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation
if (error != NULL) {
[invocation setArgument:error atIndex:3]; [invocation setArgument:error atIndex:3];
}
[invocation invoke]; [invocation invoke];
[invocation getReturnValue:&JSON]; [invocation getReturnValue:&JSON];
@ -158,7 +164,9 @@ id AFJSONDecode(NSData *data, NSError **error) {
NSUInteger yajlParserOptions = 0; NSUInteger yajlParserOptions = 0;
[invocation setArgument:&yajlParserOptions atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation [invocation setArgument:&yajlParserOptions atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation
if (error != NULL) {
[invocation setArgument:error atIndex:3]; [invocation setArgument:error atIndex:3];
}
[invocation invoke]; [invocation invoke];
[invocation getReturnValue:&JSON]; [invocation getReturnValue:&JSON];
@ -169,7 +177,9 @@ id AFJSONDecode(NSData *data, NSError **error) {
invocation.selector = _NXJsonParserSelector; invocation.selector = _NXJsonParserSelector;
[invocation setArgument:&data atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation [invocation setArgument:&data atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation
if (error != NULL) {
[invocation setArgument:error atIndex:3]; [invocation setArgument:error atIndex:3];
}
[invocation setArgument:&nullOption atIndex:4]; [invocation setArgument:&nullOption atIndex:4];
[invocation invoke]; [invocation invoke];
@ -185,7 +195,9 @@ id AFJSONDecode(NSData *data, NSError **error) {
[invocation setArgument:&data atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation [invocation setArgument:&data atIndex:2]; // arguments 0 and 1 are self and _cmd respectively, automatically set by NSInvocation
NSUInteger readOptions = 0; NSUInteger readOptions = 0;
[invocation setArgument:&readOptions atIndex:3]; [invocation setArgument:&readOptions atIndex:3];
if (error != NULL) {
[invocation setArgument:error atIndex:4]; [invocation setArgument:error atIndex:4];
}
[invocation invoke]; [invocation invoke];
[invocation getReturnValue:&JSON]; [invocation getReturnValue:&JSON];