From d2635afea2d8680fc637be0dd85ec6d008ac80b8 Mon Sep 17 00:00:00 2001 From: Kenneth Pouncey Date: Tue, 22 Jan 2019 06:36:27 +0100 Subject: [PATCH] [wasm] Fix a few issues that crop up from time to time. Mostly affects running in an AOT'd application. --- sdks/wasm/binding_support.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sdks/wasm/binding_support.js b/sdks/wasm/binding_support.js index 68acd9f81d5..e00c7b858db 100644 --- a/sdks/wasm/binding_support.js +++ b/sdks/wasm/binding_support.js @@ -593,8 +593,12 @@ var BindingSupportLib = { throw new Error (msg); //the convention is that invoke_method ToString () any outgoing exception } - if (args_marshal.length >= args.length && args_marshal [args.length] == 'm') - return res; + if (args_marshal !== null && typeof args_marshal !== "undefined") + { + if (args_marshal.length >= args.length && args_marshal [args.length] == 'm') + return res; + } + return this.unbox_mono_obj (res); }, @@ -616,7 +620,7 @@ var BindingSupportLib = { if (!this.delegate_dynamic_invoke) throw new Error("System.Delegate.DynamicInvoke method can not be resolved."); - return this.call_method (this.delegate_dynamic_invoke, this.extract_mono_obj (delegate_obj), "m", [ mono_args ]); + return this.call_method (this.delegate_dynamic_invoke, this.extract_mono_obj (delegate_obj), "mm", [ mono_args ]); }, resolve_method_fqn: function (fqn) { -- 2.11.4.GIT