[[ Bug 20886 ]] Fix crash when class omitted in objc binding

livecodeali · livecodeali · commit 6acc827f1482 · 2018-01-26T14:48:47.000Z
diff --git a/docs/lcb/notes/20886.md b/docs/lcb/notes/20886.md
@@ -0,0 +1 @@
+# [20886] Fix crash when class is omitted in obj-c binding string
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -978,12 +978,6 @@ __MCScriptResolveForeignFunctionBindingForObjC(MCScriptInstanceRef p_instance,
     {
         return false;
     }
-    
-    MCAutoStringRefAsUTF8String t_class_cstring;
-    if (!t_class_cstring.Lock(*t_class))
-    {
-        return false;
-    }
 
     bool t_valid = true;
     bool t_is_dynamic = MCStringIsEmpty(*t_class);
@@ -1002,6 +996,12 @@ __MCScriptResolveForeignFunctionBindingForObjC(MCScriptInstanceRef p_instance,
         }
         else
         {
+            MCAutoStringRefAsUTF8String t_class_cstring;
+            if (!t_class_cstring.Lock(*t_class))
+            {
+                return false;
+            }
+            
             t_objc_class = objc_getClass(*t_class_cstring);
             if (t_objc_class == nullptr)
             {
diff --git a/tests/lcb/vm/interop-objc.lcb b/tests/lcb/vm/interop-objc.lcb
@@ -221,6 +221,21 @@ public handler TestDynamicInstanceMethodBinding()
 	end unsafe
 end handler
 
+foreign handler DynamicGetIntNoClass(in pObject as ObjcId) returns CInt \ 
+	binds to "objc:-intValue"
+
+public handler TestDynamicInstanceMethodNoClassCrash()
+	if not the operating system is in ["mac", "ios"] then
+		skip test "obj-c dynamic instance method binding no class crash" \
+			because "not implemented on" && the operating system
+		return
+	end if
+
+	unsafe 	
+		test "dynamic method binds" when DynamicGetIntNoClass is not nothing
+	end unsafe
+end handler
+
 foreign handler DynamicAlloc() returns ObjcRetainedId \ 
 	binds to "objc:.+alloc"
 	

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [20886] Fix crash when class is omitted in obj-c binding string`
Original file line number	Diff line number	Diff line change
`@@ -978,12 +978,6 @@ __MCScriptResolveForeignFunctionBindingForObjC(MCScriptInstanceRef p_instance,`
`978`	`978`	`{`
`979`	`979`	`return false;`
`980`	`980`	`}`
`981`		`-`
`982`		`- MCAutoStringRefAsUTF8String t_class_cstring;`
`983`		`- if (!t_class_cstring.Lock(*t_class))`
`984`		`- {`
`985`		`- return false;`
`986`		`- }`
`987`	`981`
`988`	`982`	`bool t_valid = true;`
`989`	`983`	`bool t_is_dynamic = MCStringIsEmpty(*t_class);`
`@@ -1002,6 +996,12 @@ __MCScriptResolveForeignFunctionBindingForObjC(MCScriptInstanceRef p_instance,`
`1002`	`996`	`}`
`1003`	`997`	`else`
`1004`	`998`	`{`
	`999`	`+ MCAutoStringRefAsUTF8String t_class_cstring;`
	`1000`	`+ if (!t_class_cstring.Lock(*t_class))`
	`1001`	`+ {`
	`1002`	`+ return false;`
	`1003`	`+ }`
	`1004`	`+`
`1005`	`1005`	`t_objc_class = objc_getClass(*t_class_cstring);`
`1006`	`1006`	`if (t_objc_class == nullptr)`
`1007`	`1007`	`{`