From 8fa861758fcb6fbbf78c05f9a49595630432e92c Mon Sep 17 00:00:00 2001 From: EAirPeter Date: Mon, 27 Feb 2023 21:46:39 +0800 Subject: [PATCH] Fix incorrect aligned_size invocations in operator overrides (#597) --- src/snmalloc/override/new.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/snmalloc/override/new.cc b/src/snmalloc/override/new.cc index 84f0cfc..29372a7 100644 --- a/src/snmalloc/override/new.cc +++ b/src/snmalloc/override/new.cc @@ -74,25 +74,25 @@ void operator delete[](void* p, std::nothrow_t&) void* operator new(size_t size, std::align_val_t val) { - size = aligned_size(size, size_t(val)); + size = aligned_size(size_t(val), size); return ThreadAlloc::get().alloc(size); } void* operator new[](size_t size, std::align_val_t val) { - size = aligned_size(size, size_t(val)); + size = aligned_size(size_t(val), size); return ThreadAlloc::get().alloc(size); } void* operator new(size_t size, std::align_val_t val, std::nothrow_t&) { - size = aligned_size(size, size_t(val)); + size = aligned_size(size_t(val), size); return ThreadAlloc::get().alloc(size); } void* operator new[](size_t size, std::align_val_t val, std::nothrow_t&) { - size = aligned_size(size, size_t(val)); + size = aligned_size(size_t(val), size); return ThreadAlloc::get().alloc(size); } @@ -108,7 +108,7 @@ void operator delete[](void* p, std::align_val_t) EXCEPTSPEC void operator delete(void* p, size_t size, std::align_val_t val)EXCEPTSPEC { - size = aligned_size(size, size_t(val)); + size = aligned_size(size_t(val), size); ThreadAlloc::get().dealloc(p, size); } @@ -116,6 +116,6 @@ void operator delete[](void* p, size_t size, std::align_val_t val) EXCEPTSPEC { if (p == nullptr) return; - size = aligned_size(size, size_t(val)); + size = aligned_size(size_t(val), size); ThreadAlloc::get().dealloc(p, size); }