diff options
| author | Christopher Ferris <cferris@google.com> | 2015-06-25 17:53:08 +0000 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2015-06-25 14:21:16 -0700 |
| commit | 83223d199a69b16d459ab14914d9e491b9571722 (patch) | |
| tree | 56fb00646d67fa74db8012fd81f440c05a83127a | |
| parent | 4e5c283ab0d7de8f5c851a04cebbb414a340dc40 (diff) | |
| download | jemalloc-83223d199a69b16d459ab14914d9e491b9571722.tar.gz | |
Revert "Temporary patch to avoid crashes."
This reverts commit 165e51a7a9067485e7b54b14b571020d7d9bdfc5.
Bug: 21873627
(cherry picked from commit e061b100c81b16715745fec44bfd97bff82a190b)
Change-Id: I3aed110d2036d023dee32dc0c47ea762f470bdf9
| -rw-r--r-- | src/arena.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/arena.c b/src/arena.c index 0ee46d3..e822b58 100644 --- a/src/arena.c +++ b/src/arena.c @@ -2356,11 +2356,6 @@ arena_dalloc_small(arena_t *arena, arena_chunk_t *chunk, void *ptr, { arena_chunk_map_bits_t *bitselm; - /* Temporary workaround to avoid crashes. b/20296122. */ - if (arena == NULL) { - return; - } - /* End of workaround. */ if (config_debug) { /* arena_ptr_small_binind_get() does extra sanity checking. */ assert(arena_ptr_small_binind_get(ptr, arena_mapbits_get(chunk, |