Clone import in instantiate to prevent import move

tprk77 · Feb 20, 2019 · b073145 · b073145
1 parent d2f3023
commit b073145
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/runtime-c-api/src/lib.rs b/lib/runtime-c-api/src/lib.rs
@@ -467,7 +467,7 @@ pub unsafe extern "C" fn wasmer_instantiate(
             wasmer_import_export_kind::WASM_GLOBAL => import.value.global as *mut Export,
             wasmer_import_export_kind::WASM_TABLE => import.value.table as *mut Export,
         };
-        namespace.insert(import_name, unsafe { *Box::from_raw(export) }); // TODO Review
+        namespace.insert(import_name, unsafe { (&*export).clone() });
     }
     for (module_name, namespace) in namespaces.into_iter() {
         import_object.register(module_name, namespace);
@@ -488,7 +488,6 @@ pub unsafe extern "C" fn wasmer_instantiate(
         }
     };
     unsafe { *instance = Box::into_raw(Box::new(new_instance)) as *mut wasmer_instance_t };
-    Box::into_raw(Box::new(import_object));
     wasmer_result_t::WASMER_OK
 }
 

diff --git a/lib/runtime-c-api/tests/test-import-function.c b/lib/runtime-c-api/tests/test-import-function.c
@@ -84,7 +84,7 @@ int main()
     assert(0 == strcmp(actual_str, "Hello, World!"));
 
     printf("Destroying func\n");
-  //  wasmer_func_destroy(func);
+    wasmer_func_destroy(func);
     printf("Destroy instance\n");
     wasmer_instance_destroy(instance);
     return 0;