summaryrefslogtreecommitdiff
path: root/src/net/ea/messagein.cpp
diff options
context:
space:
mode:
authorBernd Wachter <bwachter-tmw@lart.info>2009-11-14 02:22:06 +0100
committerJared Adams <jaxad0127@gmail.com>2009-11-13 19:18:03 -0700
commit4b1aeab2af7467046cd9e411da899ce770bcd780 (patch)
treeed1bc577edf259ea67f782ff97fe70dfde17e7d8 /src/net/ea/messagein.cpp
parent546e7e29628454e18aa8af27882545b302550a03 (diff)
downloadmana-client-4b1aeab2af7467046cd9e411da899ce770bcd780.tar.gz
mana-client-4b1aeab2af7467046cd9e411da899ce770bcd780.tar.bz2
mana-client-4b1aeab2af7467046cd9e411da899ce770bcd780.tar.xz
mana-client-4b1aeab2af7467046cd9e411da899ce770bcd780.zip
Copy ints by memcpy to avoid segfaults on sparc
Diffstat (limited to 'src/net/ea/messagein.cpp')
-rw-r--r--src/net/ea/messagein.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/net/ea/messagein.cpp b/src/net/ea/messagein.cpp
index 0b1ab70a..1cca786a 100644
--- a/src/net/ea/messagein.cpp
+++ b/src/net/ea/messagein.cpp
@@ -43,7 +43,9 @@ int MessageIn::readInt16()
if (mPos + 2 <= mLength)
{
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- value = SDL_Swap16(*(Sint16*)(mData + mPos));
+ Sint16 swap;
+ memcpy(&swap, mData + mPos, sizeof(Sint16));
+ value = SDL_Swap16(swap);
#else
value = (*(Sint16*)(mData + mPos));
#endif
@@ -58,7 +60,9 @@ int MessageIn::readInt32()
if (mPos + 4 <= mLength)
{
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- value = SDL_Swap32(*(Sint32*)(mData + mPos));
+ Sint32 swap;
+ memcpy(&swap, mData + mPos, sizeof(Sint32));
+ value = SDL_Swap32(swap);
#else
value = (*(Sint32*)(mData + mPos));
#endif