Fix #832: Only copy/move storage value when optional is valid (#833)

ETLCPP · Jan 27, 2024 · 8403165 · 8403165
1 parent 0f1840a
commit 8403165
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/include/etl/optional.h b/include/etl/optional.h
@@ -768,7 +768,10 @@ namespace etl
     {
       if (this != &other)
       {
-        storage.value = other.storage.value;
+        if (other.valid)
+        {
+          storage.value = other.storage.value;
+        }
         valid = other.valid;
       }
 
@@ -783,7 +786,10 @@ namespace etl
     {
       if (this != &other)
       {
-        storage.value = etl::move(other.storage.value);
+        if (other.valid)
+        {
+          storage.value = etl::move(other.storage.value);
+        }
         valid = other.valid;
       }