Merge branch 'master' into blender2.8

1 files changed, 7 insertions, 6 deletions

diff --git a/intern/guardedalloc/intern/mallocn_lockfree_impl.c b/intern/guardedalloc/intern/mallocn_lockfree_impl.c
index 9575375d90a..d01ad6c8d72 100644
--- a/intern/guardedalloc/intern/mallocn_lockfree_impl.c
+++ b/intern/guardedalloc/intern/mallocn_lockfree_impl.c
@@ -204,9 +204,9 @@ void *MEM_lockfree_reallocN_id(void *vmemh, size_t len, const char *str)
 		else {
 			MemHeadAligned *memh_aligned = MEMHEAD_ALIGNED_FROM_PTR(vmemh);
 			newp = MEM_lockfree_mallocN_aligned(
-				old_len,
-				(size_t)memh_aligned->alignment,
-				"realloc");
+			        len,
+			        (size_t)memh_aligned->alignment,
+			        "realloc");
 		}
 
 		if (newp) {
@@ -242,9 +242,10 @@ void *MEM_lockfree_recallocN_id(void *vmemh, size_t len, const char *str)
 		}
 		else {
 			MemHeadAligned *memh_aligned = MEMHEAD_ALIGNED_FROM_PTR(vmemh);
-			newp = MEM_lockfree_mallocN_aligned(old_len,
-			                                    (size_t)memh_aligned->alignment,
-			                                    "recalloc");
+			newp = MEM_lockfree_mallocN_aligned(
+			        len,
+			        (size_t)memh_aligned->alignment,
+			        "recalloc");
 		}
 
 		if (newp) {