fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 06:15:33 +00:00
Code Issues Projects Releases Wiki Activity

Fixed false positives in Emscripten detection. (#35)

Browse Source 
Almost all languages targeting WebAssembly create imports from
"env" module by default, which means that Emscripten was being
detected even when it wasn't used.

Use "_emscripten_memcpy_big" as a signal, since it's imported
in all WASM modules produced by Emscripten, even as simple as:

    EMSCRIPTEN_KEEPALIVE
    int
    main(int argc, const char** argv) {
        return 0;
    }

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
This commit is contained in:
Piotr Sikora 2018-12-05 18:01:52 -08:00 committed by Lachlan Sneff
parent 9fa190165e
commit c18065a8f0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/apis/emscripten/tests/is_emscripten_true.wast
View File

@ -1,6 +1,7 @@
(module
(type $FUNCSIG$ii (func (param i32) (result i32)))
(import "env" "puts" (func $puts (param i32) (result i32)))
(import "env" "_emscripten_memcpy_big" (func $_emscripten_memcpy_big (param i32 i32 i32) (result i32)))
(table 0 anyfunc)
(memory $0 1)
(data (i32.const 16) "hello, world!\00")

4
src/apis/emscripten/utils.rs
View File

@ -8,8 +8,8 @@ use std::slice;
/// We check if a provided module is an Emscripten generated one
pub fn is_emscripten_module(module: &Module) -> bool {
for (module, _field) in &module.info.imported_funcs {
if module == "env" {
for (module, field) in &module.info.imported_funcs {
if field == "_emscripten_memcpy_big" && module == "env" {
return true;
}
}