diff options
author | Marc Gilleron <marc.gilleron@gmail.com> | 2021-01-07 01:05:12 +0000 |
---|---|---|
committer | Marc Gilleron <marc.gilleron@gmail.com> | 2021-01-07 01:05:12 +0000 |
commit | fb71edd45b2473bf0ac502c777a1850fb564087e (patch) | |
tree | 5d7a48365313cd54a2a763efa85728c36cf7ed86 /src/core/Dictionary.cpp | |
parent | 43828ebb3931b9117ad57f08cc457e052fdfd631 (diff) | |
download | redot-cpp-fb71edd45b2473bf0ac502c777a1850fb564087e.tar.gz |
Fix container and string leaks
Some functions return a new instance of such containers,
but instead we made a copy of them, without taking ownership of the
original created by the function.
Now we use a specific constructor taking ownership on the godot_* struct.
Diffstat (limited to 'src/core/Dictionary.cpp')
-rw-r--r-- | src/core/Dictionary.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/Dictionary.cpp b/src/core/Dictionary.cpp index 17f16a4..9c5be43 100644 --- a/src/core/Dictionary.cpp +++ b/src/core/Dictionary.cpp @@ -45,16 +45,18 @@ uint32_t Dictionary::hash() const { Array Dictionary::keys() const { godot_array a = godot::api->godot_dictionary_keys(&_godot_dictionary); - return *(Array *)&a; + return Array(a); } Variant &Dictionary::operator[](const Variant &key) { - return *(Variant *)godot::api->godot_dictionary_operator_index(&_godot_dictionary, (godot_variant *)&key); + godot_variant *v = godot::api->godot_dictionary_operator_index(&_godot_dictionary, (godot_variant *)&key); + return *reinterpret_cast<Variant *>(v); } const Variant &Dictionary::operator[](const Variant &key) const { // oops I did it again - return *(Variant *)godot::api->godot_dictionary_operator_index((godot_dictionary *)&_godot_dictionary, (godot_variant *)&key); + godot_variant *v = godot::api->godot_dictionary_operator_index((godot_dictionary *)&_godot_dictionary, (godot_variant *)&key); + return *reinterpret_cast<Variant *>(v); } int Dictionary::size() const { @@ -63,12 +65,12 @@ int Dictionary::size() const { String Dictionary::to_json() const { godot_string s = godot::api->godot_dictionary_to_json(&_godot_dictionary); - return *(String *)&s; + return String(s); } Array Dictionary::values() const { godot_array a = godot::api->godot_dictionary_values(&_godot_dictionary); - return *(Array *)&a; + return Array(a); } Dictionary::~Dictionary() { |