diff options
| author | Sverker Eriksson <[email protected]> | 2018-10-17 20:44:36 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-10-17 20:44:36 +0200 |
| commit | d8c30a6895006a3422ac106392fc66f3202491c2 (patch) | |
| tree | b3563ff2231006bc2965e1e0585852ef250977cb /erts/emulator/beam/erl_alloc.c | |
| parent | e3bea67151cbd6d7df47f1bc68b460e3679ad678 (diff) | |
| parent | 04dde143c505da42ca620189cfa1d3400610ebe1 (diff) | |
| download | otp-d8c30a6895006a3422ac106392fc66f3202491c2.tar.gz otp-d8c30a6895006a3422ac106392fc66f3202491c2.tar.bz2 otp-d8c30a6895006a3422ac106392fc66f3202491c2.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index 36c46fd7aa..1d4b33c598 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -4072,6 +4072,9 @@ debug_free(ErtsAlcType_t type, void *extra, void *ptr) ASSERT(ERTS_ALC_N_MIN <= n && n <= ERTS_ALC_N_MAX); + if (!ptr) + return; + dptr = check_memory_fence(ptr, &size, n, ERTS_ALC_O_FREE); #ifdef ERTS_ALC_A_EXEC |