From 464cff6238bd2b61307a3f97c1d5c6a762993278 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sat, 23 Jan 2021 12:58:57 +0000 Subject: [PATCH] Added nullptr check to unique_ptr destructor --- include/etl/memory.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/etl/memory.h b/include/etl/memory.h index 8b98f9b0..242472da 100644 --- a/include/etl/memory.h +++ b/include/etl/memory.h @@ -1256,6 +1256,7 @@ namespace etl //********************************* unique_ptr(unique_ptr&& p_) ETL_NOEXCEPT : p(p_.release()) + , deleter(etl::move(p_.deleter)) { } #endif @@ -1281,7 +1282,10 @@ namespace etl //********************************* ~unique_ptr() { - deleter(p); + if (p != ETL_NULLPTR) + { + deleter(p); + } } //*********************************