Merge pull request #96 from AdrianAtGoogle/unaligned_reads

Unaligned reads
lighttransport · Oct 12, 2023 · 86699be · 86699be
2 parents 3b6c98e + 865d44a
commit 86699be
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/stream-reader.hh b/src/stream-reader.hh
@@ -203,8 +203,8 @@ class StreamReader {
       return false;
     }
 
-    unsigned short val =
-        *(reinterpret_cast<const unsigned short *>(&binary_[idx_]));
+    unsigned short val;
+    memcpy(&val, &binary_[idx_], sizeof(val));
 
     if (swap_endian_) {
       swap2(&val);
@@ -221,7 +221,8 @@ class StreamReader {
       return false;
     }
 
-    uint32_t val = *(reinterpret_cast<const uint32_t *>(&binary_[idx_]));
+    uint32_t val;
+    memcpy(&val, &binary_[idx_], sizeof(val));
 
     if (swap_endian_) {
       swap4(&val);
@@ -238,7 +239,8 @@ class StreamReader {
       return false;
     }
 
-    int val = *(reinterpret_cast<const int *>(&binary_[idx_]));
+    int val;
+    memcpy(&val, &binary_[idx_], sizeof(val));
 
     if (swap_endian_) {
       swap4(&val);
@@ -255,7 +257,8 @@ class StreamReader {
       return false;
     }
 
-    uint64_t val = *(reinterpret_cast<const uint64_t *>(&binary_[idx_]));
+    uint64_t val;
+    memcpy(&val, &binary_[idx_], sizeof(val));
 
     if (swap_endian_) {
       swap8(&val);
@@ -272,7 +275,8 @@ class StreamReader {
       return false;
     }
 
-    int64_t val = *(reinterpret_cast<const int64_t *>(&binary_[idx_]));
+    int64_t val;
+    memcpy(&val, &binary_[idx_], sizeof(val));
 
     if (swap_endian_) {
       swap8(&val);

diff --git a/src/tinyusdz.cc b/src/tinyusdz.cc
@@ -341,8 +341,8 @@ bool ParseUSDZHeader(const uint8_t *addr, const size_t length,
 
     uint16_t compr_method = *reinterpret_cast<uint16_t *>(&local_header[0] + 8);
     // uint32_t compr_bytes = *reinterpret_cast<uint32_t*>(&local_header[0]+18);
-    uint32_t uncompr_bytes =
-        *reinterpret_cast<uint32_t *>(&local_header[0] + 22);
+    uint32_t uncompr_bytes;
+    memcpy(&uncompr_bytes, &local_header[22], sizeof(uncompr_bytes));
 
     // USDZ only supports uncompressed ZIP
     if (compr_method != 0) {