godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11724 from marcelofg55/visualscript_crashfix 

VisualScript crashfix when returns are too few
This commit is contained in:
Poommetee Ketson 2017-10-02 23:40:44 +07:00 committed by GitHub
parent 30c1449289 57ef77376f
commit e8f0817eac
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/visual_script/visual_script_func_nodes.cpp
View File

@ -763,7 +763,7 @@ public:
NodePath node_path; NodePath node_path;
int input_args; int input_args;
bool validate; bool validate;
bool returns; int returns;
VisualScriptFunctionCall::RPCCallMode rpc_mode; VisualScriptFunctionCall::RPCCallMode rpc_mode;
StringName function; StringName function;
StringName singleton; StringName singleton;
@ -856,7 +856,13 @@ public:
} }
} else if (returns) { } else if (returns) {
if (call_mode == VisualScriptFunctionCall::CALL_MODE_INSTANCE) { if (call_mode == VisualScriptFunctionCall::CALL_MODE_INSTANCE) {
if (returns >= 2) {
*p_outputs[1] = v.call(function, p_inputs + 1, input_args, r_error); *p_outputs[1] = v.call(function, p_inputs + 1, input_args, r_error);
} else {
r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
r_error_str = "Invalid returns count for call_mode == CALL_MODE_INSTANCE";
return 0;
}
} else { } else {
*p_outputs[0] = v.call(function, p_inputs + 1, input_args, r_error); *p_outputs[0] = v.call(function, p_inputs + 1, input_args, r_error);
} }