diff options
| author | Rickard Green <[email protected]> | 2018-01-11 15:56:29 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-01-11 15:56:29 +0100 |
| commit | 45c0938066e151112f7ac3d961d9300693004b48 (patch) | |
| tree | 240dfc2df3e49bd43aab61c4c52df315732d633e /erts/emulator/beam/beam_load.c | |
| parent | a5b047d1da2169f55f554e342ab5beca7931c820 (diff) | |
| parent | c73337fa1d95f4da5e3c702d0346130f7e0b5aac (diff) | |
| download | otp-45c0938066e151112f7ac3d961d9300693004b48.tar.gz otp-45c0938066e151112f7ac3d961d9300693004b48.tar.bz2 otp-45c0938066e151112f7ac3d961d9300693004b48.zip | |
Merge branch 'maint'
* maint:
Fix encoding of filenames in stacktraces
Diffstat (limited to 'erts/emulator/beam/beam_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index e43f7fda2c..beaef0951e 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2017. All Rights Reserved. + * Copyright Ericsson AB 1996-2018. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,6 +40,7 @@ #include "erl_zlib.h" #include "erl_map.h" #include "erl_process_dict.h" +#include "erl_unicode.h" #ifdef HIPE #include "hipe_bif0.h" @@ -1806,7 +1807,7 @@ read_line_table(LoaderState* stp) GetInt(stp, 2, n); GetString(stp, fname, n); - stp->fname[i] = erts_atom_put(fname, n, ERTS_ATOM_ENC_LATIN1, 1); + stp->fname[i] = erts_atom_put(fname, n, ERTS_ATOM_ENC_UTF8, 1); } } @@ -6254,8 +6255,7 @@ erts_build_mfa_item(FunctionInfo* fi, Eterm* hp, Eterm args, Eterm* mfa_p) file_term = buf_to_intlist(&hp, ".erl", 4, NIL); file_term = buf_to_intlist(&hp, (char*)ap->name, ap->len, file_term); } else { - Atom* ap = atom_tab(atom_val((fi->fname_ptr)[file-1])); - file_term = buf_to_intlist(&hp, (char*)ap->name, ap->len, NIL); + file_term = erts_atom_to_string(&hp, (fi->fname_ptr)[file-1]); } tuple = TUPLE2(hp, am_line, make_small(line)); |