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

Prevent encode_variant doing memcpy from nullptr

Browse source
This commit is contained in:
A Thousand Ships 2023-10-29 17:59:44 +01:00
parent 9144457484
commit 210461f2ed
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/io/marshalls.cpp
View file

@ -1621,8 +1621,10 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
encode_uint32(datalen, buf); encode_uint32(datalen, buf);
buf += 4; buf += 4;
const uint8_t *r = data.ptr(); const uint8_t *r = data.ptr();
memcpy(buf, &r[0], datalen * datasize); if (r) {
buf += datalen * datasize; memcpy(buf, &r[0], datalen * datasize);
buf += datalen * datasize;
}
} }
r_len += 4 + datalen * datasize; r_len += 4 + datalen * datasize;