Skip to content

Commit 09fccab

Browse files
committed
Merge pull request #15 from aogilvie/fix/nullObjectAssignmentForOptions
fix bug where not passing options or passing null would crash application
2 parents 24a3f0a + cbffbe6 commit 09fccab

File tree

1 file changed

+6
-6
lines changed
  • example/ios/exampleWizCanvas/Plugins/jp.wizcorp.phonegap.plugin.wizCanvasPlugin/WizCanvas

1 file changed

+6
-6
lines changed

example/ios/exampleWizCanvas/Plugins/jp.wizcorp.phonegap.plugin.wizCanvasPlugin/WizCanvas/WizCanvasPlugin.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,13 @@ - (void)hideView:(CDVInvokedUrlCommand *)command {
238238
// Assign new hide callback
239239
self.hideViewCallbackId = command.callbackId;
240240

241-
NSDictionary *options;
241+
NSDictionary *options = NULL;
242242
if ([command.arguments count] > 0) {
243243
// Assign options
244244
options = [command.arguments objectAtIndex:1];
245245
}
246246

247-
if (options) {
247+
if (![options isKindOfClass:[NSNull class]]) {
248248
NSDictionary *animationDict = [options objectForKey:@"animation"];
249249
if (animationDict) {
250250
NSString *type = [animationDict objectForKey:@"type"];
@@ -356,12 +356,12 @@ - (void)showView:(CDVInvokedUrlCommand *)command {
356356
// Assign new show callback
357357
self.showViewCallbackId = command.callbackId;
358358

359-
NSDictionary *options;
359+
NSDictionary *options = NULL;
360360
if ([command.arguments count] > 0) {
361361
// Assign options
362362
options = [command.arguments objectAtIndex:1];
363363
}
364-
if (options) {
364+
if (![options isKindOfClass:[NSNull class]]) {
365365
NSDictionary* animationDict = [options objectForKey:@"animation"];
366366
if (animationDict) {
367367

@@ -453,14 +453,14 @@ - (void)load:(CDVInvokedUrlCommand *)command {
453453
// assign arguments
454454
NSString *viewName = [command.arguments objectAtIndex:0];
455455

456-
NSDictionary* options;
456+
NSDictionary *options = NULL;
457457
if ([command.arguments count] > 0) {
458458
options = [command.arguments objectAtIndex:1];
459459
}
460460

461461
WizLog(@"[WizCanvasPlugin] ******* Load into canvas : %@ - viewlist -> %@ options %@", viewName, wizViewList, options);
462462

463-
if (options) {
463+
if (![options isKindOfClass:[NSNull class]]) {
464464
// Find the correct view
465465
if ([wizViewList objectForKey:viewName]) {
466466

0 commit comments

Comments
 (0)