Fix JSValue memory leak in move constructor (#7868)

microsoft · May 28, 2021 · 3bfe8e1 · 3bfe8e1
1 parent 8209eb5
commit 3bfe8e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/change/react-native-windows-01974fdb-aa04-49a7-ad88-8715629563e1.json b/change/react-native-windows-01974fdb-aa04-49a7-ad88-8715629563e1.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fix JSValue memory leak in move constructor",
+  "packageName": "react-native-windows",
+  "email": "vmorozov@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Microsoft.ReactNative.Cxx/JSValue.cpp b/vnext/Microsoft.ReactNative.Cxx/JSValue.cpp
@@ -439,13 +439,13 @@ void JSValueArray::WriteTo(IJSValueWriter const &writer) const noexcept {
 JSValue::JSValue(JSValue &&other) noexcept : m_type{other.m_type} {
   switch (m_type) {
     case JSValueType::Object:
-      new (&m_object) JSValueObject(std::move(other.m_object));
+      new (std::addressof(m_object)) JSValueObject(std::move(other.m_object));
       break;
     case JSValueType::Array:
-      new (&m_array) JSValueArray(std::move(other.m_array));
+      new (std::addressof(m_array)) JSValueArray(std::move(other.m_array));
       break;
     case JSValueType::String:
-      new (&m_string) std::string(std::move(other.m_string));
+      new (std::addressof(m_string)) std::string(std::move(other.m_string));
       break;
     case JSValueType::Boolean:
       m_bool = other.m_bool;
@@ -458,8 +458,7 @@ JSValue::JSValue(JSValue &&other) noexcept : m_type{other.m_type} {
       break;
   }
 
-  other.m_type = JSValueType::Null;
-  other.m_int64 = 0;
+  other.~JSValue();
 }
 #pragma warning(pop)