mirror of
https://github.com/godotengine/godot.git
synced 2024-11-22 04:06:14 +00:00
Fix arg count checks in SceneDebugger
This commit is contained in:
parent
0c2144da90
commit
95809e58d5
@ -163,6 +163,7 @@ Error SceneDebugger::parse_message(void *p_user, const String &p_msg, const Arra
|
||||
live_editor->_res_set_func(p_args[0], p_args[1], p_args[2]);
|
||||
|
||||
} else if (p_msg == "live_node_call") {
|
||||
ERR_FAIL_COND_V(p_args.size() < 2, ERR_INVALID_DATA);
|
||||
LocalVector<Variant> args;
|
||||
LocalVector<Variant *> argptrs;
|
||||
args.resize(p_args.size() - 2);
|
||||
@ -171,11 +172,10 @@ Error SceneDebugger::parse_message(void *p_user, const String &p_msg, const Arra
|
||||
args[i] = p_args[i + 2];
|
||||
argptrs[i] = &args[i];
|
||||
}
|
||||
live_editor->_node_call_func(p_args[0], p_args[1], (const Variant **)argptrs.ptr(), argptrs.size());
|
||||
live_editor->_node_call_func(p_args[0], p_args[1], argptrs.size() ? (const Variant **)argptrs.ptr() : nullptr, argptrs.size());
|
||||
|
||||
} else if (p_msg == "live_res_call") {
|
||||
ERR_FAIL_COND_V(p_args.size() < 10, ERR_INVALID_DATA);
|
||||
|
||||
ERR_FAIL_COND_V(p_args.size() < 2, ERR_INVALID_DATA);
|
||||
LocalVector<Variant> args;
|
||||
LocalVector<Variant *> argptrs;
|
||||
args.resize(p_args.size() - 2);
|
||||
@ -184,7 +184,7 @@ Error SceneDebugger::parse_message(void *p_user, const String &p_msg, const Arra
|
||||
args[i] = p_args[i + 2];
|
||||
argptrs[i] = &args[i];
|
||||
}
|
||||
live_editor->_res_call_func(p_args[0], p_args[1], (const Variant **)argptrs.ptr(), argptrs.size());
|
||||
live_editor->_res_call_func(p_args[0], p_args[1], argptrs.size() ? (const Variant **)argptrs.ptr() : nullptr, argptrs.size());
|
||||
|
||||
} else if (p_msg == "live_create_node") {
|
||||
ERR_FAIL_COND_V(p_args.size() < 3, ERR_INVALID_DATA);
|
||||
|
Loading…
Reference in New Issue
Block a user