gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-02-06 23:15:16 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix libc-wasi/uvwasi poll/environ_get issues (#1300)

Browse Source 
Fix libc-wasi poll_oneoff hang issue
Fix libc-uvwasi environ_get sanity check issue
This commit is contained in:
Wenyong Huang 2022-07-20 20:02:26 +08:00 committed by GitHub
parent 1ee0d90d81
commit d955aa1bcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/iwasm/libraries/libc-uvwasi/libc_uvwasi_wrapper.c
View File

@ -186,6 +186,9 @@ wasi_environ_get(wasm_exec_env_t exec_env, uint32 *environ_offsets,
if (err) if (err)
return err; return err;
if (environ_count == 0)
return 0;
total_size = sizeof(int32) * ((uint64)environ_count + 1); total_size = sizeof(int32) * ((uint64)environ_count + 1);
if (total_size >= UINT32_MAX if (total_size >= UINT32_MAX
|| !validate_native_addr(environ_offsets, (uint32)total_size) || !validate_native_addr(environ_offsets, (uint32)total_size)

2
core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c
View File

@ -2595,7 +2595,7 @@ wasmtime_ssp_poll_oneoff(
timeout = ts > INT_MAX ? -1 : (int)ts; timeout = ts > INT_MAX ? -1 : (int)ts;
} }
else { else {
timeout = -1; timeout = 1000;
} }
int ret = poll(pfds, nsubscriptions, timeout); int ret = poll(pfds, nsubscriptions, timeout);