Merge pull request #29011 from zann1x/master

Initialize padding on PoolByteArray serialization

Merge pull request #29011 from zann1x/master
9065cc24 · Rémi Verschelde · GitHub · aa33b6a3 · c35f4e88 · 9065cc24
Unverified Commit 9065cc24 authored May 21, 2019 by Rémi Verschelde Committed by GitHub May 21, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

marshalls.cpp core/io/marshalls.cpp +5 -1

No files found.
--- 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: {