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

Merge pull request #16033 from poke1024/marshalls-dict

Browse source 
Detects crash-related marshalling errors due to NAN values
This commit is contained in:
Juan Linietsky 2018-05-07 17:51:06 -03:00 committed by GitHub
commit cbd849d13f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/io/marshalls.cpp
View file

@ -1211,7 +1211,9 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
r_len += len; r_len += len;
if (buf) if (buf)
buf += len; buf += len;
encode_variant(d[E->get()], buf, len, p_object_as_id); Variant *v = d.getptr(E->get());
ERR_FAIL_COND_V(!v, ERR_BUG);
encode_variant(*v, buf, len, p_object_as_id);
ERR_FAIL_COND_V(len % 4, ERR_BUG); ERR_FAIL_COND_V(len % 4, ERR_BUG);
r_len += len; r_len += len;
if (buf) if (buf)