Merge pull request godotengine#333 from sheepandshepherd/string-plus-leak

akien-mga · web-flow · commit 81783c6045ac · 2020-01-19T23:35:06.000+01:00
Fix String::operator+ memory leak
diff --git a/src/core/String.cpp b/src/core/String.cpp
@@ -124,8 +124,8 @@ bool String::operator!=(const String &s) const {
 }
 
 String String::operator+(const String &s) const {
-	String new_string = *this;
-	new_string._godot_string = godot::api->godot_string_operator_plus(&new_string._godot_string, &s._godot_string);
+	String new_string;
+	new_string._godot_string = godot::api->godot_string_operator_plus(&_godot_string, &s._godot_string);
 
 	return new_string;
 }

Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,8 @@ bool String::operator!=(const String &s) const {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`String String::operator+(const String &s) const {`
`127`		`- String new_string = *this;`
`128`		`- new_string._godot_string = godot::api->godot_string_operator_plus(&new_string._godot_string, &s._godot_string);`
	`127`	`+ String new_string;`
	`128`	`+ new_string._godot_string = godot::api->godot_string_operator_plus(&_godot_string, &s._godot_string);`
`129`	`129`
`130`	`130`	`return new_string;`
`131`	`131`	`}`