aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/bif.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-08-23 14:26:23 +0200
committerRickard Green <[email protected]>2017-08-23 14:26:23 +0200
commitdb8fba1aace21af71e015e2620ed6e7c1a5bfab2 (patch)
treeb270e4ab7bf4c09342400c1fbfcdcd5264cec45f /erts/emulator/beam/bif.c
parent8453bda5805bc8a2d4709b5d15643fb0512a8a23 (diff)
parentd50bc5031eb0889c894bf20f5206cfc06162f30a (diff)
downloadotp-db8fba1aace21af71e015e2620ed6e7c1a5bfab2.tar.gz
otp-db8fba1aace21af71e015e2620ed6e7c1a5bfab2.tar.bz2
otp-db8fba1aace21af71e015e2620ed6e7c1a5bfab2.zip
Merge branch 'maint'
* maint: Unicode support for erlang:display_string/1
Diffstat (limited to 'erts/emulator/beam/bif.c')
-rw-r--r--erts/emulator/beam/bif.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 8e3b28cd60..7e26af5abd 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -3889,15 +3889,18 @@ BIF_RETTYPE display_string_1(BIF_ALIST_1)
{
Process* p = BIF_P;
Eterm string = BIF_ARG_1;
- Sint len = is_string(string);
- char *str;
+ Sint len = erts_unicode_list_to_buf_len(string);
+ Sint written;
+ byte *str;
+ int res;
- if (len <= 0) {
+ if (len < 0) {
BIF_ERROR(p, BADARG);
}
- str = (char *) erts_alloc(ERTS_ALC_T_TMP, sizeof(char)*(len + 1));
- if (intlist_to_buf(string, str, len) != len)
- erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error\n", __FILE__, __LINE__);
+ str = (byte *) erts_alloc(ERTS_ALC_T_TMP, sizeof(char)*(len + 1));
+ res = erts_unicode_list_to_buf(string, str, len, &written);
+ if (res != 0 || written != len)
+ erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error (%d)\n", __FILE__, __LINE__, res);
str[len] = '\0';
erts_fprintf(stderr, "%s", str);
erts_free(ERTS_ALC_T_TMP, (void *) str);