Check for nullptr when accessing isInspectable method

fromcelticpark · facebook-github-bot · commit 70d23e82ad21 · 2018-01-23T10:13:36.000-08:00
Reviewed By: javache

Differential Revision: D6785733

fbshipit-source-id: 1bbb884746e671124b7d2d950a3419ea33d70522
diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
@@ -191,11 +191,12 @@ + (void)initialize
 
 - (JSGlobalContextRef)jsContextRef
 {
-  return (JSGlobalContextRef)(self->_reactInstance ? self->_reactInstance->getJavaScriptContext() : nullptr);
+  return (JSGlobalContextRef)(_reactInstance ? _reactInstance->getJavaScriptContext() : nullptr);
 }
 
-- (BOOL)isInspectable {
-  return self->_reactInstance->isInspectable();
+- (BOOL)isInspectable
+{
+  return _reactInstance ? _reactInstance->isInspectable() : NO;
 }
 
 - (instancetype)initWithParentBridge:(RCTBridge *)bridge

Original file line number	Diff line number	Diff line change
`@@ -191,11 +191,12 @@ + (void)initialize`
`191`	`191`
`192`	`192`	`- (JSGlobalContextRef)jsContextRef`
`193`	`193`	`{`
`194`		`- return (JSGlobalContextRef)(self->_reactInstance ? self->_reactInstance->getJavaScriptContext() : nullptr);`
	`194`	`+ return (JSGlobalContextRef)(_reactInstance ? _reactInstance->getJavaScriptContext() : nullptr);`
`195`	`195`	`}`
`196`	`196`
`197`		`-- (BOOL)isInspectable {`
`198`		`- return self->_reactInstance->isInspectable();`
	`197`	`+- (BOOL)isInspectable`
	`198`	`+{`
	`199`	`+ return _reactInstance ? _reactInstance->isInspectable() : NO;`
`199`	`200`	`}`
`200`	`201`
`201`	`202`	`- (instancetype)initWithParentBridge:(RCTBridge *)bridge`