project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check tsdn_null before reading reentrancy level.

Browse Source
This commit is contained in:
Qi Wang 2017-12-22 11:22:16 -08:00 committed by Qi Wang
parent 91b247d311
commit 41790f4fa4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/jemalloc/internal/jemalloc_internal_inlines_c.h
View File

@ -111,7 +111,8 @@ idalloctm(tsdn_t *tsdn, void *ptr, tcache_t *tcache, alloc_ctx_t *alloc_ctx,
if (config_stats && is_internal) { if (config_stats && is_internal) {
arena_internal_sub(iaalloc(tsdn, ptr), isalloc(tsdn, ptr)); arena_internal_sub(iaalloc(tsdn, ptr), isalloc(tsdn, ptr));
} }
if (!is_internal && tsd_reentrancy_level_get(tsdn_tsd(tsdn)) != 0) { if (!is_internal && !tsdn_null(tsdn) &&
tsd_reentrancy_level_get(tsdn_tsd(tsdn)) != 0) {
assert(tcache == NULL); assert(tcache == NULL);
} }
arena_dalloc(tsdn, ptr, tcache, alloc_ctx, slow_path); arena_dalloc(tsdn, ptr, tcache, alloc_ctx, slow_path);