Merge pull request #5948 from pec1985/TIMOB-17448

[TIMOB-17448] iOS - Fixed crash when module.exports is not an object
tidev · Aug 20, 2014 · dde2bbc · dde2bbc
2 parents d28980b + 1fd6f05
commit dde2bbc
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/iphone/Classes/KrollCallback.m b/iphone/Classes/KrollCallback.m
@@ -241,9 +241,15 @@ - (void)replaceValue:(id)value forKey:(NSString*)key notification:(BOOL)notify
 	 */
 	KrollContext * context = [bridge krollContext];
 	TiValueRef valueRef = [KrollObject toValue:context value:value];
-	TiStringRef keyRef = TiStringCreateWithCFString((CFStringRef) key);
-	TiObjectSetProperty([context context], jsobject, keyRef, valueRef, kTiPropertyAttributeReadOnly, NULL);
-	TiStringRelease(keyRef);
+
+	/*
+	 * Properties can only be added to objects
+	 */
+	if(TiValueIsObject([context context], jsobject)) {
+		TiStringRef keyRef = TiStringCreateWithCFString((CFStringRef) key);
+		TiObjectSetProperty([context context], jsobject, keyRef, valueRef, kTiPropertyAttributeReadOnly, NULL);
+		TiStringRelease(keyRef);
+	}
 }
 
 @end