Fix missaligned read/write2.0.0

1 files changed, 4 insertions, 27 deletions

diff --git a/sibs/SafeSerializer.hpp b/sibs/SafeSerializer.hpp
index 0aa53c5..68b6e7c 100644
--- a/sibs/SafeSerializer.hpp
+++ b/sibs/SafeSerializer.hpp
@@ -5,6 +5,7 @@
 #include "../utils.hpp"
 #include <vector>
 #include <cstring>
+#include <algorithm>
 
 namespace sibs
 {
@@ -24,33 +25,9 @@ namespace sibs
         void add(const T &data)
         {
             usize offset = buffer.size();
-            buffer.resize(buffer.size() + sizeof(T));
+            buffer.insert(buffer.end(), (unsigned char*)&data, (unsigned char*)&data + sizeof(T));
             #if BYTE_ORDER == BIG_ENDIAN
-            switch(sizeof(T))
-            {
-                case 1:
-                    *(T*)&buffer[offset] = data;
-                    break;
-                case 2:
-                    *(u16*)&buffer[offset] = byteswap(*(u16*)&data);
-                    break;
-                case 4:
-                    *(u32*)&buffer[offset] = byteswap(*(u32*)&data);
-                    break;
-                case 8:
-                    *(u64*)&buffer[offset] = byteswap(*(u64*)&data);
-                    break;
-                default:
-                {
-                    for(int i = 0; i < sizeof(T); ++i)
-                    {
-                        buffer[offset + i] = ((char*)&data)[sizeof(T) - 1 - i];
-                    }
-                    break;
-                }
-            }
-            #else
-            *(T*)&buffer[offset] = data;
+            std::reverse((char*)&buffer[offset], (char*)&buffer[offset] + sizeof(T));
             #endif
         }
         
@@ -60,7 +37,7 @@ namespace sibs
             {
                 usize offset = buffer.size();
                 buffer.resize(buffer.size() + size);
-                memcpy(&buffer[offset], data, size);
+                memmove(&buffer[offset], data, size);
             }
         }