aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_alloc.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-10-31 16:31:34 +0100
committerGitHub <[email protected]>2018-10-31 16:31:34 +0100
commitfa6994f5c8384a15196121fce2983291c9c21245 (patch)
tree0b01c4e37ce21c5863d7607214ca097445ed673d /erts/emulator/beam/erl_alloc.c
parenta03b0b0298208216481fdc2a373e5cda893535d2 (diff)
parentcc18836780d7d047bf53b1ff8d94a6b31b58f98a (diff)
downloadotp-fa6994f5c8384a15196121fce2983291c9c21245.tar.gz
otp-fa6994f5c8384a15196121fce2983291c9c21245.tar.bz2
otp-fa6994f5c8384a15196121fce2983291c9c21245.zip
Merge PR-1997 from sverker/erts/ordered_set-select-improvements/OTP-15325
Even more scalable ETS ordered_set with write_concurrency
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
-rw-r--r--erts/emulator/beam/erl_alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 1d4b33c598..e6169ebeaa 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -4041,7 +4041,7 @@ debug_realloc(ErtsAlcType_t type, void *extra, void *ptr, Uint size)
erts_hdbg_chk_blks();
#endif
- if (old_size > size)
+ if (ptr && old_size > size)
sys_memset((void *) (((char *) ptr) + size),
0xf,
sizeof(Uint) + old_size - size);