From 9b14efd6f70508a25d750bd1f131610f09bf57a9 Mon Sep 17 00:00:00 2001 From: DDuarte Date: Sat, 27 Sep 2014 22:06:34 +0100 Subject: Core/ByteBuffer: Call FlushBits() in every append, not only on fundamental types --- src/server/shared/Packets/ByteBuffer.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index f7d27697f24..d65b6c58a51 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -118,7 +118,6 @@ class ByteBuffer template void append(T value) { static_assert(std::is_fundamental::value, "append(compound)"); - FlushBits(); EndianConvert(value); append((uint8 *)&value, sizeof(value)); } @@ -128,9 +127,10 @@ class ByteBuffer if (_bitpos == 8) return; + _bitpos = 8; + append((uint8 *)&_curbitval, sizeof(uint8)); _curbitval = 0; - _bitpos = 8; } bool WriteBit(uint32 bit) @@ -583,6 +583,8 @@ class ByteBuffer ASSERT(size() < 10000000); + FlushBits(); + if (_storage.size() < _wpos + cnt) _storage.resize(_wpos + cnt); std::memcpy(&_storage[_wpos], src, cnt); -- cgit v1.2.3