bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix fetching arguments on the wasm32-wasi target

Browse source 
Fixes an error introduced in #66750 where wasi executables always think
they have zero arguments because one of the vectors returned here
accidentally thought it was length 0.
This commit is contained in:
Alex Crichton 2019-12-05 11:01:26 -08:00
parent a0312c156d
commit f7789ad5b2
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libstd/sys/wasi/args.rs
View file

@ -26,6 +26,7 @@ fn maybe_args() -> Option<Vec<OsString>> {
let mut argv = Vec::with_capacity(argc); let mut argv = Vec::with_capacity(argc);
let mut buf = Vec::with_capacity(buf_size); let mut buf = Vec::with_capacity(buf_size);
wasi::args_get(argv.as_mut_ptr(), buf.as_mut_ptr()).ok()?; wasi::args_get(argv.as_mut_ptr(), buf.as_mut_ptr()).ok()?;
argv.set_len(argc);
let mut ret = Vec::with_capacity(argc); let mut ret = Vec::with_capacity(argc);
for ptr in argv { for ptr in argv {
let s = CStr::from_ptr(ptr.cast()); let s = CStr::from_ptr(ptr.cast());