[[ Bug 20519 ]] Ensure handler return value survives trampoline

livecodeali · livecodeali · commit ddd6e75162f0 · 2017-11-15T23:05:11.000Z
diff --git a/docs/notes/bugfix-20519.md b/docs/notes/bugfix-20519.md
@@ -0,0 +1 @@
+# Prevent android native field widget crash on ime action
diff --git a/libfoundation/src/foundation-handler.cpp b/libfoundation/src/foundation-handler.cpp
@@ -64,7 +64,7 @@ struct MCHandlerInvokeTrampolineContext
     MCHandlerRef self;
     MCValueRef *p_arguments;
     uindex_t p_argument_count;
-    MCValueRef r_value;
+    MCValueRef& r_value;
     bool return_value;
 };
 
@@ -98,10 +98,7 @@ bool MCHandlerExternalInvoke(MCHandlerRef self, MCValueRef *p_arguments, uindex_
         return t_context.return_value;
     }
 #endif
-    
-    __MCAssertIsHandler(self);
-    MCAssert(p_arguments != nil || p_argument_count == 0);
-    return self -> callbacks -> invoke(MCHandlerGetContext(self), p_arguments, p_argument_count, r_value);
+    return MCHandlerInvoke(self, p_arguments, p_argument_count, r_value);
 }
 
 MC_DLLEXPORT_DEF

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Prevent android native field widget crash on ime action`