From a98256c57a335e91ad93bc9f6bcd9d671877ec3d Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 19 Dec 2024 19:43:06 +0100 Subject: Core/PacketIO: Fixed endian conversions for array operations (cherry picked from commit 736836a3f5307c9cdf5f843893ff9d144efa69d1) --- src/server/shared/Packets/ByteBuffer.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/server/shared') diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 2f59f0db873..0f9d3f753d3 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -457,7 +457,11 @@ class TC_SHARED_API ByteBuffer void read(T* dest, size_t count) { static_assert(std::is_trivially_copyable_v, "read(T*, size_t) must be used with trivially copyable types"); - return read(reinterpret_cast(dest), count * sizeof(T)); + read(reinterpret_cast(dest), count * sizeof(T)); +#if TRINITY_ENDIAN == TRINITY_BIGENDIAN + for (size_t i = 0; i < count; ++i) + EndianConvert(dest[i]); +#endif } void read(uint8* dest, size_t len) @@ -556,7 +560,12 @@ class TC_SHARED_API ByteBuffer template void append(T const* src, size_t cnt) { - return append(reinterpret_cast(src), cnt * sizeof(T)); +#if TRINITY_ENDIAN == TRINITY_LITTLEENDIAN + append(reinterpret_cast(src), cnt * sizeof(T)); +#else + for (size_t i = 0; i < cnt; ++i) + append(src[i]); +#endif } void append(uint8 const* src, size_t cnt); -- cgit v1.2.3