diff options
author | Erlang/OTP <[email protected]> | 2017-01-12 15:16:02 +0100 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2017-01-12 15:16:02 +0100 |
commit | 905e6ea8c21e8bcba0933a147ef70f7044e6bead (patch) | |
tree | 341bb2f6a854b22d3c94f64a9a8c93ee9a4564cf /erts/emulator/beam/export.c | |
parent | 3473ecd83a7bbe7e0bebb865f25dddb93e3bf10f (diff) | |
parent | af5169d85fcd545e3c857a219db081a62f33404d (diff) | |
download | otp-905e6ea8c21e8bcba0933a147ef70f7044e6bead.tar.gz otp-905e6ea8c21e8bcba0933a147ef70f7044e6bead.tar.bz2 otp-905e6ea8c21e8bcba0933a147ef70f7044e6bead.zip |
Merge branch 'sverker/make-export-fun-race/OTP-14144' into maint-19
* sverker/make-export-fun-race/OTP-14144:
erts: Fix race bug between export fun creation and code loading
Diffstat (limited to 'erts/emulator/beam/export.c')
-rw-r--r-- | erts/emulator/beam/export.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/export.c b/erts/emulator/beam/export.c index 7f043e191b..00fa452f79 100644 --- a/erts/emulator/beam/export.c +++ b/erts/emulator/beam/export.c @@ -348,7 +348,7 @@ Export *export_list(int i, ErtsCodeIndex code_ix) int export_list_size(ErtsCodeIndex code_ix) { - return export_tables[code_ix].entries; + return erts_index_num_entries(&export_tables[code_ix]); } int export_table_sz(void) |