diff options
| author | Rickard Green <[email protected]> | 2014-06-06 01:39:13 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-06 01:39:13 +0200 |
| commit | 29a3141244d09fda6700ab3016407c0fa52d92f6 (patch) | |
| tree | 0a727ac37bdd853ae4ea877805ff4f7daff62b69 /erts/emulator/beam/erl_unicode.c | |
| parent | 269a7f1cfdc46fb2a81e8d40210747f77f6aab37 (diff) | |
| parent | 3c1e5f014d8c957cfc085d200ca744bd4ad2a7bb (diff) | |
| download | otp-29a3141244d09fda6700ab3016407c0fa52d92f6.tar.gz otp-29a3141244d09fda6700ab3016407c0fa52d92f6.tar.bz2 otp-29a3141244d09fda6700ab3016407c0fa52d92f6.zip | |
Merge branch 'rickard/disable-gc-fix/OTP-11887' into maint
* rickard/disable-gc-fix/OTP-11887:
Do not GC other processes in non-smp runtime
Fix conversion of empty string in erts_convert_native_to_filename()
Add support for failing in BIF that has trapped
HiPE wrappers for BIFs disabling GC
Diffstat (limited to 'erts/emulator/beam/erl_unicode.c')
| -rw-r--r-- | erts/emulator/beam/erl_unicode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_unicode.c b/erts/emulator/beam/erl_unicode.c index 3a968594f3..f8e1431a53 100644 --- a/erts/emulator/beam/erl_unicode.c +++ b/erts/emulator/beam/erl_unicode.c @@ -2126,6 +2126,8 @@ Eterm erts_convert_native_to_filename(Process *p, byte *bytes) mac = 1; case ERL_FILENAME_UTF8: size = strlen((char *) bytes); + if (size == 0) + return NIL; if (erts_analyze_utf8(bytes,size,&err_pos,&num_chars,NULL) != ERTS_UTF8_OK) { goto noconvert; } |