Merge pull request #6369 from livecodeali/bugfix-20992

livecodepanos · web-flow · commit 546458ddbc83 · 2018-03-06T11:16:05.000Z
[[ Bug 20992 ]] Use local frame for interface proxy creation
diff --git a/docs/notes/bugfix-20992.md b/docs/notes/bugfix-20992.md
@@ -0,0 +1 @@
+# Fix crash when using several android native fields
diff --git a/libfoundation/src/foundation-java-private.cpp b/libfoundation/src/foundation-java-private.cpp
@@ -1441,10 +1441,15 @@ bool MCJavaCreateInterfaceProxy(MCNameRef p_class_name, MCTypeInfoRef p_signatur
     if (MCHandlerTypeInfoGetParameterCount(p_signature) != 1)
         return false;
     
+    s_env->PushLocalFrame(0);
+    
     MCValueRef t_handlers = *(static_cast<MCValueRef *>(p_args[0]));
-
+    
     if (!__MCJavaIsHandlerSuitableForListener(p_class_name, t_handlers))
+    {
+        s_env->PopLocalFrame(nullptr);
         return false;
+    }
     
     jclass t_inv_handler_class =
         MCJavaPrivateFindClass(MCNAME("com.runrev.android.LCBInvocationHandler"));
@@ -1460,12 +1465,17 @@ bool MCJavaCreateInterfaceProxy(MCNameRef p_class_name, MCTypeInfoRef p_signatur
                                                     t_interface,
                                                     t_handler);
     
+    
     MCJavaObjectRef t_result_value;
-    if (!MCJavaObjectCreateNullable(t_proxy, t_result_value))
-        return false;
+    bool t_success = MCJavaObjectCreateNullable(t_proxy, t_result_value);
+    if (t_success)
+    {
+        *(static_cast<MCJavaObjectRef *>(r_result)) = t_result_value;
+    }
     
-    *(static_cast<MCJavaObjectRef *>(r_result)) = t_result_value;
-    return true;
+    s_env->PopLocalFrame(nullptr);
+    
+    return t_success;
 }
 
 bool MCJavaPrivateCallJNIMethodOnEnv(void *p_env, MCNameRef p_class_name, void *p_method_id, int p_call_type, MCTypeInfoRef p_signature, void *r_return, void **p_args, uindex_t p_arg_count)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix crash when using several android native fields`