浏览代码

Merge pull request #38357 from ThakeeNathees/dict2inst-crash-fix

fix: dict2inst crash when constructor has arguments
Rémi Verschelde 5 年之前
父节点
当前提交
b61a496aa7
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      modules/gdscript/gdscript_functions.cpp

+ 5 - 0
modules/gdscript/gdscript_functions.cpp

@@ -1199,6 +1199,11 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			}
 			r_ret = gdscr->_new(nullptr, -1 /*skip initializer*/, r_error);
 
+			if (r_error.error != Callable::CallError::CALL_OK) {
+				r_ret = Variant();
+				return;
+			}
+
 			GDScriptInstance *ins = static_cast<GDScriptInstance *>(static_cast<Object *>(r_ret)->get_script_instance());
 			Ref<GDScript> gd_ref = ins->get_script();