From 1f368ead6c8a62c740f34972a77125698daea45c Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sat, 23 Sep 2023 11:29:14 +0100 Subject: [PATCH] #766 etl::unique_ptr::reset() can call deleter with nullptr argument --- include/etl/memory.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/etl/memory.h b/include/etl/memory.h index 38e9889c..c4eb8fa9 100644 --- a/include/etl/memory.h +++ b/include/etl/memory.h @@ -1399,7 +1399,11 @@ namespace etl pointer value = p; p = p_; - deleter(value); + + if (value != ETL_NULLPTR) + { + deleter(value); + } } //********************************* @@ -1605,7 +1609,11 @@ namespace etl pointer value = p; p = p_; - delete[] value; + + if (value != ETL_NULLPTR) + { + deleter(value); + } } //*********************************