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 | |
| parent | e3bea67151cbd6d7df47f1bc68b460e3679ad678 (diff) | |
| parent | 04dde143c505da42ca620189cfa1d3400610ebe1 (diff) | |
| download | otp-d8c30a6895006a3422ac106392fc66f3202491c2.tar.gz otp-d8c30a6895006a3422ac106392fc66f3202491c2.tar.bz2 otp-d8c30a6895006a3422ac106392fc66f3202491c2.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 3 | ||||
| -rw-r--r-- | lib/stdlib/doc/src/assert_hrl.xml | 2 |
2 files changed, 4 insertions, 1 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 diff --git a/lib/stdlib/doc/src/assert_hrl.xml b/lib/stdlib/doc/src/assert_hrl.xml index 4dc7299609..fb27954235 100644 --- a/lib/stdlib/doc/src/assert_hrl.xml +++ b/lib/stdlib/doc/src/assert_hrl.xml @@ -46,7 +46,7 @@ is the macro name, for example, <c>assertEqual</c>. <c>Info</c> is a list of tagged values, such as <c>[{module, M}, {line, L}, ...]</c>, which gives more information about the location and cause of the exception. All - entries in the <c>Info</c> list are optional; do not rely programatically + entries in the <c>Info</c> list are optional; do not rely programmatically on any of them being present.</p> <p>Each assert macro has a corresponding version with an extra argument, |