diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-11 13:53:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 13:53:12 +0100 |
| commit | 3e9a40cdc0c2fe70c3278f0208e4798a226ee70f (patch) | |
| tree | 43d20f3ef560d15b61141980f86c2d111babe389 /modules | |
| parent | 8363c442652e5997874cc3ee73da66f39cf7f591 (diff) | |
| parent | 0d4b750051ac8e31349cb71c31f98a93acf317bb (diff) | |
Merge pull request #44604 from lyuma/gdscript_dictionary_crash
GDScript: Fix crash when iterating through empty dictionary.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdscript/gdscript_vm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_vm.cpp b/modules/gdscript/gdscript_vm.cpp index 4abd2e00f4..29c4ff6214 100644 --- a/modules/gdscript/gdscript_vm.cpp +++ b/modules/gdscript/gdscript_vm.cpp @@ -2306,10 +2306,10 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a Dictionary *dict = VariantInternal::get_dictionary(container); const Variant *next = dict->next(nullptr); - *counter = *next; if (!dict->is_empty()) { GET_INSTRUCTION_ARG(iterator, 2); + *counter = *next; *iterator = *next; // Skip regular iterate. |