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

Prevent encode_variant doing memcpy from nullptr

Browse Source 
(cherry picked from commit 210461f2ed)
This commit is contained in:
A Thousand Ships 2023-10-29 17:59:44 +01:00 committed by Yuri Sizov
parent 3d4f1ce21f
commit 36c7a47b11
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

@ -1619,8 +1619,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;