From 470b435afd347d954344ae611d130dbf0b8c7e87 Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Wed, 10 Jul 2024 19:16:40 +0200 Subject: [PATCH] fextl: Properly handle nullptr arguments in fextl::default_delete This reflects behavior of std::default_delete. --- FEXCore/include/FEXCore/fextl/memory.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/FEXCore/include/FEXCore/fextl/memory.h b/FEXCore/include/FEXCore/fextl/memory.h index f4d860a30..116fabe40 100644 --- a/FEXCore/include/FEXCore/fextl/memory.h +++ b/FEXCore/include/FEXCore/fextl/memory.h @@ -9,8 +9,10 @@ namespace fextl { template struct default_delete : public std::default_delete { void operator()(T* ptr) const { - std::destroy_at(ptr); - FEXCore::Allocator::aligned_free(ptr); + if (ptr) { + std::destroy_at(ptr); + FEXCore::Allocator::aligned_free(ptr); + } } template