Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix incorrect size in aligned lockfree realloc

Browse Source 
Thanks to @alikendarfen for finding.
This commit is contained in:
Campbell Barton
2018-05-23 07:24:57 +02:00
parent 3ada840e65
commit 103a31f712
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
intern/guardedalloc/intern/mallocn_lockfree_impl.c
View File

@@ -204,9 +204,9 @@ void *MEM_lockfree_reallocN_id(void *vmemh, size_t len, const char *str)
else { else {
MemHeadAligned *memh_aligned = MEMHEAD_ALIGNED_FROM_PTR(vmemh); MemHeadAligned *memh_aligned = MEMHEAD_ALIGNED_FROM_PTR(vmemh);
newp = MEM_lockfree_mallocN_aligned( newp = MEM_lockfree_mallocN_aligned(
old_len, len,
(size_t)memh_aligned->alignment, (size_t)memh_aligned->alignment,
"realloc"); "realloc");
} }
if (newp) { if (newp) {
@@ -242,9 +242,10 @@ void *MEM_lockfree_recallocN_id(void *vmemh, size_t len, const char *str)
} }
else { else {
MemHeadAligned *memh_aligned = MEMHEAD_ALIGNED_FROM_PTR(vmemh); MemHeadAligned *memh_aligned = MEMHEAD_ALIGNED_FROM_PTR(vmemh);
newp = MEM_lockfree_mallocN_aligned(old_len, newp = MEM_lockfree_mallocN_aligned(
(size_t)memh_aligned->alignment, len,
"recalloc"); (size_t)memh_aligned->alignment,
"recalloc");
} }
if (newp) { if (newp) {