aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/global.h
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-10-02 10:43:20 +0200
committerRickard Green <[email protected]>2017-10-02 10:43:20 +0200
commitd8fc2c8c1b0424ee42b1ddc8aef63056bc9e85fb (patch)
treec17a33e5956f9fbd630f7387f432a5aaf92d5e8f /erts/emulator/beam/global.h
parent9033a41375f3a31a18eb0cba3ea0dc84efbc0aa0 (diff)
parent0717a2194e863f3a78595184ccc5637697f03353 (diff)
downloadotp-d8fc2c8c1b0424ee42b1ddc8aef63056bc9e85fb.tar.gz
otp-d8fc2c8c1b0424ee42b1ddc8aef63056bc9e85fb.tar.bz2
otp-d8fc2c8c1b0424ee42b1ddc8aef63056bc9e85fb.zip
Merge branch 'maint'
* maint: Don't allow null in filenames
Diffstat (limited to 'erts/emulator/beam/global.h')
-rw-r--r--erts/emulator/beam/global.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 09aeba00fa..604172857a 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -1238,7 +1238,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);