diff options
author | Rickard Green <[email protected]> | 2017-10-02 10:41:15 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2017-10-02 10:41:15 +0200 |
commit | 0717a2194e863f3a78595184ccc5637697f03353 (patch) | |
tree | ecc57cc352c8d2171c0f7a329799bfd92a325b73 /erts/emulator/beam/erl_bif_port.c | |
parent | 71a40658a0cef8b3e25df3a8e48a72d0563a89bf (diff) | |
parent | eae496a72e270fd7af411714738e99a7fadfd19b (diff) | |
download | otp-0717a2194e863f3a78595184ccc5637697f03353.tar.gz otp-0717a2194e863f3a78595184ccc5637697f03353.tar.bz2 otp-0717a2194e863f3a78595184ccc5637697f03353.zip |
Merge branch 'rickard/null-char-filenames/ERL-370/OTP-14543' into maint
* rickard/null-char-filenames/ERL-370/OTP-14543:
Don't allow null in filenames
Diffstat (limited to 'erts/emulator/beam/erl_bif_port.c')
-rw-r--r-- | erts/emulator/beam/erl_bif_port.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_port.c b/erts/emulator/beam/erl_bif_port.c index ff03151619..1121a450cd 100644 --- a/erts/emulator/beam/erl_bif_port.c +++ b/erts/emulator/beam/erl_bif_port.c @@ -1084,7 +1084,7 @@ static byte* convert_environment(Process* p, Eterm env) goto done; } - if ((size = erts_native_filename_need(all,encoding)) < 0) { + if ((size = erts_native_filename_need(all, encoding, 1)) < 0) { goto done; } |