diff options
| author | Sverker Eriksson <[email protected]> | 2017-02-14 18:27:17 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-02-14 18:27:17 +0100 |
| commit | e725221bcf085c1cd19f6340acb477da8aec1705 (patch) | |
| tree | c0450b7280090ec417fcc12f8cd5d3f4cc915de9 /erts/emulator/beam/erl_unicode.c | |
| parent | 70d5b560dc4894606ca7a09f3afd9a105b5a5d54 (diff) | |
| parent | 118de47d703e303aea7f4575849a37c11416ba14 (diff) | |
| download | otp-e725221bcf085c1cd19f6340acb477da8aec1705.tar.gz otp-e725221bcf085c1cd19f6340acb477da8aec1705.tar.bz2 otp-e725221bcf085c1cd19f6340acb477da8aec1705.zip | |
Merge branch 'sverker/magic-destructor-veto'
* sverker/magic-destructor-veto:
erts: Add deallocation veto for magic destructors
Diffstat (limited to 'erts/emulator/beam/erl_unicode.c')
| -rw-r--r-- | erts/emulator/beam/erl_unicode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_unicode.c b/erts/emulator/beam/erl_unicode.c index dd7c589c3d..01629db9ad 100644 --- a/erts/emulator/beam/erl_unicode.c +++ b/erts/emulator/beam/erl_unicode.c @@ -123,10 +123,11 @@ static void cleanup_restart_context(RestartContext *rc) } } -static void cleanup_restart_context_bin(Binary *bp) +static int cleanup_restart_context_bin(Binary *bp) { RestartContext *rc = ERTS_MAGIC_BIN_DATA(bp); cleanup_restart_context(rc); + return 1; } static RestartContext *get_rc_from_bin(Eterm mref) |