diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-19 22:57:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-19 22:57:44 +0200 |
| commit | 910f32d48ddbae2ec8f2e85b678ade60ff04c8fa (patch) | |
| tree | 6f3a8732e335240bb26c9b5fdca0a9733090657a /dep/jemalloc/src/arena.c | |
| parent | 34572492dd1394dbeaf19bb697a7af8cbf0b6ef7 (diff) | |
| parent | 57069b393d7698bc0f860ad1b2d0b16785f9e8e0 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
Diffstat (limited to 'dep/jemalloc/src/arena.c')
| -rw-r--r-- | dep/jemalloc/src/arena.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dep/jemalloc/src/arena.c b/dep/jemalloc/src/arena.c index 390ab0f8230..dad707b63d0 100644 --- a/dep/jemalloc/src/arena.c +++ b/dep/jemalloc/src/arena.c @@ -614,8 +614,11 @@ arena_chunk_alloc(arena_t *arena) if (arena->spare != NULL) chunk = arena_chunk_init_spare(arena); - else + else { chunk = arena_chunk_init_hard(arena); + if (chunk == NULL) + return (NULL); + } /* Insert the run into the runs_avail tree. */ arena_avail_insert(arena, chunk, map_bias, chunk_npages-map_bias, |