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/global.h | |
| 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/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 182d3aa44e..ddf7f03265 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -1253,7 +1253,7 @@ void erts_init_unicode(void); Sint erts_unicode_set_loop_limit(Sint limit); void erts_native_filename_put(Eterm ioterm, int encoding, byte *p) ; -Sint erts_native_filename_need(Eterm ioterm, int encoding); +Sint erts_native_filename_need(Eterm ioterm, int encoding, int allow_null); void erts_copy_utf8_to_utf16_little(byte *target, byte *bytes, int num_chars); int erts_analyze_utf8(byte *source, Uint size, byte **err_pos, Uint *num_chars, int *left); |