diff options
| author | Sverker Eriksson <[email protected]> | 2017-03-08 14:46:24 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-03-08 18:07:09 +0100 |
| commit | 32d13d59910a384ad09682cafc83c7300c96c694 (patch) | |
| tree | 1f5bfca2565243210b16a6de2bdc3ae66cbff8bb /lib/erl_interface/src/legacy/erl_marshal.c | |
| parent | 65b04e233e09e3cc2e0fda3c28e155b95c5a4baf (diff) | |
| download | otp-32d13d59910a384ad09682cafc83c7300c96c694.tar.gz otp-32d13d59910a384ad09682cafc83c7300c96c694.tar.bz2 otp-32d13d59910a384ad09682cafc83c7300c96c694.zip | |
erl_interface: Do not generate atoms on old latin1 ext format
Solved by letting ei_encode_atom_as ignore 'to_enc' argument
and always encode in UTF8 format.
Diffstat (limited to 'lib/erl_interface/src/legacy/erl_marshal.c')
| -rw-r--r-- | lib/erl_interface/src/legacy/erl_marshal.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/erl_interface/src/legacy/erl_marshal.c b/lib/erl_interface/src/legacy/erl_marshal.c index 527ae0ef8f..b7a8455313 100644 --- a/lib/erl_interface/src/legacy/erl_marshal.c +++ b/lib/erl_interface/src/legacy/erl_marshal.c @@ -175,10 +175,9 @@ static void encode_atom(Erl_Atom_data* a, unsigned char **ext) int ix = 0; if (a->latin1) { ei_encode_atom_len_as((char*)*ext, &ix, a->latin1, a->lenL, - ERLANG_LATIN1, ERLANG_LATIN1); + ERLANG_LATIN1, ERLANG_UTF8); } - else if (ei_encode_atom_len_as((char*)*ext, &ix, a->utf8, a->lenU, - ERLANG_UTF8, ERLANG_LATIN1) < 0) { + else { ei_encode_atom_len_as((char*)*ext, &ix, a->utf8, a->lenU, ERLANG_UTF8, ERLANG_UTF8); } @@ -542,12 +541,8 @@ int erl_term_len(ETERM *ep) static int atom_len_helper(Erl_Atom_data* a) { - if (erl_atom_ptr_latin1(a)) { - return 1 + 2 + a->lenL; /* ERL_ATOM_EXT */ - } - else { - return 1 + 1 + (a->lenU > 255) + a->lenU; - } + (void) erl_atom_ptr_utf8(a); + return 1 + 1 + (a->lenU > 255) + a->lenU; } static int erl_term_len_helper(ETERM *ep, int dist) |