Merge branch 'pull-request/#858-fix-unique_ptr-assigning-nullptr-to-a…

…-null-unique_ptr-causes-an-assert' into development
ETLCPP · Mar 9, 2024 · 8593f95 · 8593f95
2 parents 9a520a3 + abb0494
commit 8593f95
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/include/etl/memory.h b/include/etl/memory.h
@@ -1424,15 +1424,21 @@ namespace etl
     //*********************************
     unique_ptr&	operator =(std::nullptr_t) ETL_NOEXCEPT
     {
-      reset(nullptr);
+      if (p)
+      {
+        reset(nullptr);
+      }
 
       return *this;
     }
 #else
     //*********************************
     unique_ptr&	operator =(void*) ETL_NOEXCEPT
     {
-      reset(NULL);
+      if (p)
+      {
+        reset(NULL);
+      }
 
       return *this;
     }

diff --git a/test/test_memory.cpp b/test/test_memory.cpp
@@ -924,6 +924,17 @@ namespace
       CHECK(!bool(up));
     }
 
+    //*************************************************************************
+    TEST(test_unique_ptr_nullptr_from_nullptr_assignment)
+    {
+      etl::unique_ptr<int> up;
+
+      up = nullptr;
+
+      CHECK(up.get() == nullptr);
+      CHECK(!bool(up));
+    }
+
     //*************************************************************************
     TEST(test_unique_ptr_move_assignment)
     {