From 4864302a1f128f83c38a83064c087e0373de0686 Mon Sep 17 00:00:00 2001 From: Wenyong Huang Date: Mon, 11 Apr 2022 11:55:37 +0800 Subject: [PATCH] Fix wasi implementation issues (#1078) Fix args_get and environ_get issues in libc-wasi and libc-uvwasi implementation. --- core/iwasm/libraries/libc-uvwasi/libc_uvwasi_wrapper.c | 2 -- core/iwasm/libraries/libc-wasi/libc_wasi_wrapper.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/core/iwasm/libraries/libc-uvwasi/libc_uvwasi_wrapper.c b/core/iwasm/libraries/libc-uvwasi/libc_uvwasi_wrapper.c index e292984e..5f2a5521 100644 --- a/core/iwasm/libraries/libc-uvwasi/libc_uvwasi_wrapper.c +++ b/core/iwasm/libraries/libc-uvwasi/libc_uvwasi_wrapper.c @@ -112,7 +112,6 @@ wasi_args_get(wasm_exec_env_t exec_env, uint32 *argv_offsets, char *argv_buf) for (i = 0; i < argc; i++) argv_offsets[i] = addr_native_to_app(argv[i]); - argv_offsets[argc] = 0; wasm_runtime_free(argv); return 0; @@ -208,7 +207,6 @@ wasi_environ_get(wasm_exec_env_t exec_env, uint32 *environ_offsets, for (i = 0; i < environ_count; i++) environ_offsets[i] = addr_native_to_app(environs[i]); - environ_offsets[environ_count] = 0; wasm_runtime_free(environs); return 0; diff --git a/core/iwasm/libraries/libc-wasi/libc_wasi_wrapper.c b/core/iwasm/libraries/libc-wasi/libc_wasi_wrapper.c index 733cd437..c819c6d9 100644 --- a/core/iwasm/libraries/libc-wasi/libc_wasi_wrapper.c +++ b/core/iwasm/libraries/libc-wasi/libc_wasi_wrapper.c @@ -131,7 +131,6 @@ wasi_args_get(wasm_exec_env_t exec_env, uint32 *argv_offsets, char *argv_buf) for (i = 0; i < argc; i++) argv_offsets[i] = addr_native_to_app(argv[i]); - argv_offsets[argc] = 0; wasm_runtime_free(argv); return 0; @@ -234,7 +233,6 @@ wasi_environ_get(wasm_exec_env_t exec_env, uint32 *environ_offsets, for (i = 0; i < environ_count; i++) environ_offsets[i] = addr_native_to_app(environs[i]); - environ_offsets[environ_count] = 0; wasm_runtime_free(environs); return 0;