asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix crash while the debugger encode a freed object.

Browse source
This commit is contained in:
Geequlim 2018-01-03 13:58:27 +08:00
parent 2c226e4edf
commit 6c8ec5a930
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/script_debugger_remote.cpp
View file

@ -129,15 +129,21 @@ static ObjectID safe_get_instance_id(const Variant &p_v) {
void ScriptDebuggerRemote::_put_variable(const String &p_name, const Variant &p_variable) { void ScriptDebuggerRemote::_put_variable(const String &p_name, const Variant &p_variable) {
packet_peer_stream->put_var(p_name); packet_peer_stream->put_var(p_name);
Variant var = p_variable;
if (p_variable.get_type() == Variant::OBJECT && !ObjectDB::instance_validate(p_variable)) {
var = Variant();
}
int len = 0; int len = 0;
Error err = encode_variant(p_variable, NULL, len); Error err = encode_variant(var, NULL, len);
if (err != OK) if (err != OK)
ERR_PRINT("Failed to encode variant"); ERR_PRINT("Failed to encode variant");
if (len > packet_peer_stream->get_output_buffer_max_size()) { //limit to max size if (len > packet_peer_stream->get_output_buffer_max_size()) { //limit to max size
packet_peer_stream->put_var(Variant()); packet_peer_stream->put_var(Variant());
} else { } else {
packet_peer_stream->put_var(p_variable); packet_peer_stream->put_var(var);
} }
} }