summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLukas Zanner <zannix@freenet.de>2019-05-19 19:09:16 +0200
committerLukas Zanner <zannix@freenet.de>2019-05-19 19:09:16 +0200
commitc35f4e880868131d442394f1c00b572a55d0ee28 (patch)
tree14c378bb8070c3ba630ab2d0e22a016cb86ccce6 /core
parentd111d59640ae93e60331f941fb2c62f460323171 (diff)
downloadredot-engine-c35f4e880868131d442394f1c00b572a55d0ee28.tar.gz
Initialize padding on PoolByteArray serialization
Diffstat (limited to 'core')
-rw-r--r--core/io/marshalls.cpp6
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: {