From 455281e44dacad343e41ea2bb7acb168dc0ba095 Mon Sep 17 00:00:00 2001
From: Nick Lockwood <nicklockwood@fb.com>
Date: Wed, 27 May 2015 08:21:14 -0700
Subject: [PATCH] Fixed crash in RCTContextExecutor when requireJSRef ==
 undefined

---
 React/Executors/RCTContextExecutor.m | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/React/Executors/RCTContextExecutor.m b/React/Executors/RCTContextExecutor.m
index 89c273481..09cfd758f 100644
--- a/React/Executors/RCTContextExecutor.m
+++ b/React/Executors/RCTContextExecutor.m
@@ -66,6 +66,7 @@
 {
   RCTJavaScriptContext *_context;
   NSThread *_javaScriptThread;
+  JSValueRef _undefined;
 }
 
 /**
@@ -237,6 +238,9 @@ static NSError *RCTNSErrorFromJSError(JSContextRef context, JSValueRef jsError)
         JSContextGroupRelease(group);
       }
 
+      // Constant value used for comparison
+      _undefined = JSValueMakeUndefined(ctx);
+
       strongSelf->_context = [[RCTJavaScriptContext alloc] initWithJSContext:ctx];
       [strongSelf _addNativeHook:RCTNativeLoggingHook withName:"nativeLoggingHook"];
       [strongSelf _addNativeHook:RCTNoop withName:"noop"];
@@ -308,7 +312,7 @@ static NSError *RCTNSErrorFromJSError(JSContextRef context, JSValueRef jsError)
     JSValueRef requireJSRef = JSObjectGetProperty(contextJSRef, globalObjectJSRef, requireNameJSStringRef, &errorJSRef);
     JSStringRelease(requireNameJSStringRef);
 
-    if (requireJSRef != NULL && errorJSRef == NULL) {
+    if (requireJSRef != NULL && requireJSRef != _undefined && errorJSRef == NULL) {
 
       // get module
       JSStringRef moduleNameJSStringRef = JSStringCreateWithCFString((__bridge CFStringRef)name);
@@ -329,16 +333,16 @@ static NSError *RCTNSErrorFromJSError(JSContextRef context, JSValueRef jsError)
           if (arguments.count == 0) {
             resultJSRef = JSObjectCallAsFunction(contextJSRef, (JSObjectRef)methodJSRef, (JSObjectRef)moduleJSRef, 0, NULL, &errorJSRef);
           }
+
           // direct method invoke with 1 argument
           else if(arguments.count == 1) {
             JSStringRef argsJSStringRef = JSStringCreateWithCFString((__bridge CFStringRef)argsString);
             JSValueRef argsJSRef = JSValueMakeFromJSONString(contextJSRef, argsJSStringRef);
             resultJSRef = JSObjectCallAsFunction(contextJSRef, (JSObjectRef)methodJSRef, (JSObjectRef)moduleJSRef, 1, &argsJSRef, &errorJSRef);
             JSStringRelease(argsJSStringRef);
+
           } else {
             // apply invoke with array of arguments
-
-            // get apply
             JSStringRef applyNameJSStringRef = JSStringCreateWithUTF8CString("apply");
             JSValueRef applyJSRef = JSObjectGetProperty(contextJSRef, (JSObjectRef)methodJSRef, applyNameJSStringRef, &errorJSRef);
             JSStringRelease(applyNameJSStringRef);
@@ -358,7 +362,6 @@ static NSError *RCTNSErrorFromJSError(JSContextRef context, JSValueRef jsError)
           }
         }
       }
-
     }
 
     if (!resultJSRef) {