浏览代码

Fix crash when iterating through empty dictionary.

Lyuma 4 年之前
父节点
当前提交
0d4b750051
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      modules/gdscript/gdscript_vm.cpp

+ 1 - 1
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);
 				Dictionary *dict = VariantInternal::get_dictionary(container);
 				const Variant *next = dict->next(nullptr);
 				const Variant *next = dict->next(nullptr);
-				*counter = *next;
 
 
 				if (!dict->empty()) {
 				if (!dict->empty()) {
 					GET_INSTRUCTION_ARG(iterator, 2);
 					GET_INSTRUCTION_ARG(iterator, 2);
+					*counter = *next;
 					*iterator = *next;
 					*iterator = *next;
 
 
 					// Skip regular iterate.
 					// Skip regular iterate.