OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #45514 - gnzlbg:jemalloc_realloc2, r=sfackler

Browse Source 
[jemalloc] set correct excess in realloc_excess
This commit is contained in:
bors 2017-11-04 04:28:13 +00:00
commit a4541525d5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/liballoc_jemalloc/lib.rs
View File

@ -203,7 +203,8 @@ mod contents {
err: *mut u8) -> *mut u8 { err: *mut u8) -> *mut u8 {
let p = __rde_alloc(size, align, err); let p = __rde_alloc(size, align, err);
if !p.is_null() { if !p.is_null() {
*excess = size; let flags = align_to_flags(align);
*excess = nallocx(size, flags) as usize;
} }
return p return p
} }
@ -219,9 +220,10 @@ mod contents {
err: *mut u8) -> *mut u8 { err: *mut u8) -> *mut u8 {
let p = __rde_realloc(ptr, old_size, old_align, new_size, new_align, err); let p = __rde_realloc(ptr, old_size, old_align, new_size, new_align, err);
if !p.is_null() { if !p.is_null() {
*excess = new_size; let flags = align_to_flags(new_align);
*excess = nallocx(new_size, flags) as usize;
} }
return p p
} }
#[no_mangle] #[no_mangle]