[[ Bug 19486 ]] Foreign handler bind failure should throw an error

runrevmark · runrevmark · commit dcc479cffa8b · 2017-03-28T19:18:51.000+01:00
This patch ensures that if foreign handler binding fails, and the
bind was required, and not optional then an appropriate error
object is thrown.
diff --git a/docs/notes/19486.md b/docs/notes/19486.md
@@ -0,0 +1,4 @@
+# LiveCode Builder Virtual Machine
+## Foreign Function Interface
+
+# [19486] Failure to bind foreign handlers should provide meaningful error
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -750,7 +750,15 @@ __MCScriptResolveForeignFunctionBinding(MCScriptInstanceRef p_instance,
                                        *t_function);
 		if (t_pointer == nullptr)
 		{
-			return false;
+            if (r_bound == nullptr)
+            {
+                return MCScriptThrowUnableToResolveForeignHandlerError(p_instance,
+                                                                       p_handler);
+            }
+            
+            *r_bound = false;
+            
+			return true;
 		}
 		
 		p_handler -> native . function = t_pointer;
@@ -799,11 +807,20 @@ __MCScriptResolveForeignFunctionBinding(MCScriptInstanceRef p_instance,
 		if (!MCJavaCheckSignature(t_signature,
 		                          *t_arguments,
 		                          *t_return,
-		                          p_handler -> java . call_type))
-            return false;
+		                          p_handler -> java . call_type) ||
+            !MCJavaVMInitialize())
+        {
+            if (r_bound == nullptr)
+            {
+                return false;
+            }
+            
+            MCErrorReset();
         
-        if (!MCJavaVMInitialize())
-            return false;
+            *r_bound = false;
+        
+            return true;
+        }
 		
         void *t_method_id = MCJavaGetMethodId(*t_class_name, *t_function, *t_arguments, *t_return, p_handler -> java . call_type);
         
@@ -815,7 +832,8 @@ __MCScriptResolveForeignFunctionBinding(MCScriptInstanceRef p_instance,
 		{
 			if (r_bound == nullptr)
 			{
-                return false;
+                return MCScriptThrowUnableToResolveForeignHandlerError(p_instance,
+                                                                       p_handler);
             }
 			*r_bound = false;
 			
