self-assignment real fix

microsoft · Aug 15, 2023 · da3f334 · da3f334
1 parent 03fba39
commit da3f334
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/stl/inc/any b/stl/inc/any
@@ -163,15 +163,12 @@ public:
 
     // Assignment [any.assign]
     any& operator=(const any& _That) {
-        *this = any{_That};
+        _Reset_and_move_from(_That);
         return *this;
     }
 
     any& operator=(any&& _That) noexcept {
-        if (this != &_That) {
-            reset();
-            _Move_from(_That);
-        }
+        _Reset_and_move_from(_STD move(_That));
         return *this;
     }
 
@@ -292,6 +289,11 @@ private:
         }
     }
 
+    void _Reset_and_move_from(any _That) noexcept {
+        reset();
+        _Move_from(_That);
+    }
+
     template <class _Decayed, class... _Types>
     _Decayed& _Emplace(_Types&&... _Args) { // emplace construct _Decayed
         if constexpr (_Any_is_trivial<_Decayed>) {