T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't add the NULL terminator to argv and environ arrays.

Browse Source 
The wasm userspace has been updated to do that instead, in
https://github.com/CraneStation/wasi-sysroot/pull/72.
This commit is contained in:
Dan Gohman
2019-05-30 08:17:00 -07:00
committed by Jakub Konka
parent 61eb4738fe
commit 3dfeab50ad
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wasmtime-wasi/sandboxed-system-primitives/src/posix.c
View File

@@ -2650,7 +2650,6 @@ __wasi_errno_t wasmtime_ssp_args_get(
for (size_t i = 0; i < argv_environ->argc; ++i) { for (size_t i = 0; i < argv_environ->argc; ++i) {
argv[i] = argv_buf + (argv_environ->argv[i] - argv_environ->argv_buf); 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); memcpy(argv_buf, argv_environ->argv_buf, argv_environ->argv_buf_size);
return __WASI_ESUCCESS; 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) { for (size_t i = 0; i < argv_environ->environ_count; ++i) {
environ[i] = environ_buf + (argv_environ->environ[i] - argv_environ->environ_buf); 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); memcpy(environ_buf, argv_environ->environ_buf, argv_environ->environ_buf_size);
return __WASI_ESUCCESS; return __WASI_ESUCCESS;
} }