diff options
| author | Frank Secilia <frank.secilia@gmail.com> | 2019-05-15 15:28:55 -0400 |
|---|---|---|
| committer | Frank Secilia <frank.secilia@gmail.com> | 2019-05-15 15:28:55 -0400 |
| commit | a4a0e642456f80b71a6383f7fccd5ea93c07c2ea (patch) | |
| tree | 701e0d6a53ec8a2d6b24957bc0e79a263b22cce9 | |
| parent | 996abb83e31453b4dcd3f4031a191aba3b392bef (diff) | |
Fix indexing failure in NativeScriptLanguage::unregister_binding_functions.
binding_functions.size() and an instance's binding_data.size() can get out of sync. They sync up when an instance's bindings are requested. When binding functions are registered after creating an instance's bindings, the instance's bindings are out of sync until requested again. If they're never requested, they're never synced.
unregister_binding_functions indexes into binding_data, but only checks that its safe to index into binding_functions. When they're out of sync, indexing fails.
This revision checks that it's safe to index into binding_data.
| -rw-r--r-- | modules/gdnative/nativescript/nativescript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp index 5cf144d4fe..04ba28dc68 100644 --- a/modules/gdnative/nativescript/nativescript.cpp +++ b/modules/gdnative/nativescript/nativescript.cpp @@ -1309,7 +1309,7 @@ void NativeScriptLanguage::unregister_binding_functions(int p_idx) { for (Set<Vector<void *> *>::Element *E = binding_instances.front(); E; E = E->next()) { Vector<void *> &binding_data = *E->get(); - if (binding_data[p_idx] && binding_functions[p_idx].second.free_instance_binding_data) + if (p_idx < binding_data.size() && binding_data[p_idx] && binding_functions[p_idx].second.free_instance_binding_data) binding_functions[p_idx].second.free_instance_binding_data(binding_functions[p_idx].second.data, binding_data[p_idx]); } |