diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-21 10:07:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 10:07:26 +0200 |
| commit | 9065cc2402b745f87af38224531de11843dcd225 (patch) | |
| tree | 9192d40fe1ba47b40de6731c3de552a5e5418c42 | |
| parent | aa33b6a3fafcd5708d1e03e859fba0e31f63a61c (diff) | |
| parent | c35f4e880868131d442394f1c00b572a55d0ee28 (diff) | |
Merge pull request #29011 from zann1x/master
Initialize padding on PoolByteArray serialization
| -rw-r--r-- | core/io/marshalls.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 81b3829ffc..d1b6b82cf0 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -1231,11 +1231,15 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo buf += 4; PoolVector<uint8_t>::Read r = data.read(); copymem(buf, &r[0], datalen * datasize); + buf += datalen * datasize; } r_len += 4 + datalen * datasize; - while (r_len % 4) + while (r_len % 4) { r_len++; + if (buf) + *(buf++) = 0; + } } break; case Variant::POOL_INT_ARRAY: { |