Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70 from Zylann/fix_register_signal 

Fix potential malloc(0)
pull/71/head
Thomas Herzog 2018-01-17 08:43:14 +01:00 committed by GitHub
parent b9b06b5fbc e7202cef8b
commit dc2896dc89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/core/Godot.hpp
View File

@ -448,9 +448,11 @@ void register_signal(String name, Dictionary args = Dictionary())
signal.num_args = args.size(); signal.num_args = args.size();
signal.num_default_args = 0; signal.num_default_args = 0;
// Need to check because malloc(0) is platform-dependent. Zero arguments will leave args to NULL.
if(signal.num_args != 0) {
signal.args = (godot_signal_argument*) godot::api->godot_alloc(sizeof(godot_signal_argument) * signal.num_args); signal.args = (godot_signal_argument*) godot::api->godot_alloc(sizeof(godot_signal_argument) * signal.num_args);
memset((void *) signal.args, 0, sizeof(godot_signal_argument) * signal.num_args); memset((void *) signal.args, 0, sizeof(godot_signal_argument) * signal.num_args);
}
for (int i = 0; i < signal.num_args; i++) { for (int i = 0; i < signal.num_args; i++) {
// Array entry = args[i]; // Array entry = args[i];
@ -471,7 +473,9 @@ void register_signal(String name, Dictionary args = Dictionary())
godot::api->godot_string_destroy(&signal.args[i].name); godot::api->godot_string_destroy(&signal.args[i].name);
} }
if(signal.args) {
godot::api->godot_free(signal.args); godot::api->godot_free(signal.args);
}
} }