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

Fix ixallocx_prof_sample() argument order reversal.

Browse Source 
Fix ixallocx_prof() to pass usize_max and zero to ixallocx_prof_sample()
in the correct order.
This commit is contained in:
Jason Evans 2015-09-14 23:32:26 -07:00
parent ce9a4e3479
commit 23f6e103c8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -33,6 +33,8 @@ brevity. Much more detail can be found in the git revision history:
the result throughout the relevant functions that handle an allocation the result throughout the relevant functions that handle an allocation
event. Also add a missing check in prof_realloc(). These fixes protect event. Also add a missing check in prof_realloc(). These fixes protect
allocation events against concurrent prof_active changes. allocation events against concurrent prof_active changes.
- Fix ixallocx_prof() to pass usize_max and zero to ixallocx_prof_sample() in
the correct order.
* 4.0.0 (August 17, 2015) * 4.0.0 (August 17, 2015)

2
src/jemalloc.c
View File

@ -2299,7 +2299,7 @@ ixallocx_prof(tsd_t *tsd, void *ptr, size_t old_usize, size_t size,
tctx = prof_alloc_prep(tsd, usize_max, prof_active, false); tctx = prof_alloc_prep(tsd, usize_max, prof_active, false);
if (unlikely((uintptr_t)tctx != (uintptr_t)1U)) { if (unlikely((uintptr_t)tctx != (uintptr_t)1U)) {
usize = ixallocx_prof_sample(ptr, old_usize, size, extra, usize = ixallocx_prof_sample(ptr, old_usize, size, extra,
alignment, zero, usize_max, tctx); alignment, usize_max, zero, tctx);
} else { } else {
usize = ixallocx_helper(ptr, old_usize, size, extra, alignment, usize = ixallocx_helper(ptr, old_usize, size, extra, alignment,
zero); zero);