From 3dfeab50ad209a67fcdd58c300ddec04532564e6 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 30 May 2019 08:17:00 -0700 Subject: [PATCH] Don't add the NULL terminator to argv and environ arrays. The wasm userspace has been updated to do that instead, in https://github.com/CraneStation/wasi-sysroot/pull/72. --- wasmtime-wasi/sandboxed-system-primitives/src/posix.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/wasmtime-wasi/sandboxed-system-primitives/src/posix.c b/wasmtime-wasi/sandboxed-system-primitives/src/posix.c index e87fbd384b..1aa533f3b5 100644 --- a/wasmtime-wasi/sandboxed-system-primitives/src/posix.c +++ b/wasmtime-wasi/sandboxed-system-primitives/src/posix.c @@ -2650,7 +2650,6 @@ __wasi_errno_t wasmtime_ssp_args_get( for (size_t i = 0; i < argv_environ->argc; ++i) { argv[i] = argv_buf + (argv_environ->argv[i] - argv_environ->argv_buf); } - argv[argv_environ->argc] = NULL; memcpy(argv_buf, argv_environ->argv_buf, argv_environ->argv_buf_size); return __WASI_ESUCCESS; } @@ -2677,7 +2676,6 @@ __wasi_errno_t wasmtime_ssp_environ_get( for (size_t i = 0; i < argv_environ->environ_count; ++i) { environ[i] = environ_buf + (argv_environ->environ[i] - argv_environ->environ_buf); } - environ[argv_environ->environ_count] = NULL; memcpy(environ_buf, argv_environ->environ_buf, argv_environ->environ_buf_size); return __WASI_ESUCCESS; }