Clean up existing data in move assignment operator

godotengine · Dec 21, 2023 · a5b7f00 · a5b7f00
1 parent 1c19d62
commit a5b7f00
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/binding_generator.py b/binding_generator.py
@@ -1060,6 +1060,8 @@ def generate_builtin_class_source(builtin_api, size, used_classes, fully_used_cl
             f"\tinternal::_call_builtin_constructor(_method_bindings.constructor_{copy_constructor_index}, &opaque, &other);"
         )
     else:
+        if builtin_api["has_destructor"]:
+            result.append("\t_method_bindings.destructor(&opaque);")
         result.append("\tstd::swap(opaque, other.opaque);")
     result.append("\treturn *this;")
     result.append("}")

diff --git a/src/variant/variant.cpp b/src/variant/variant.cpp
@@ -531,6 +531,7 @@ Variant &Variant::operator=(const Variant &other) {
 }
 
 Variant &Variant::operator=(Variant &&other) {
+	clear();
 	std::swap(opaque, other.opaque);
 	return *this;
 }