superblock: eliminate UB during binary magnitude extraction

gridcoin-community · Mar 5, 2024 · 6e92287 · 6e92287
1 parent 7cd0247
commit 6e92287
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/gridcoin/superblock.cpp b/src/gridcoin/superblock.cpp
@@ -456,8 +456,9 @@ class LegacySuperblockParser
 
         for (size_t x = 0; x < binary_size && binary_size - x >= 18; x += 18) {
             magnitudes.AddLegacy(
-                *reinterpret_cast<const Cpid*>(byte_ptr + x),
-                be16toh(*reinterpret_cast<const int16_t*>(byte_ptr + x + 16)));
+                Cpid(std::vector<unsigned char>(byte_ptr + x, byte_ptr + x + 16)),
+                (((uint16_t)byte_ptr[x + 16] & 0xFF) << 8) | ((uint16_t)byte_ptr[x + 17] & 0xFF)
+            );
         }
 
         return magnitudes;

diff --git a/src/test/gridcoin/superblock_tests.cpp b/src/test/gridcoin/superblock_tests.cpp
@@ -33,7 +33,7 @@ struct Legacy
     struct BinaryResearcher
     {
         std::array<unsigned char, 16> cpid;
-        int16_t magnitude;
+        uint16_t magnitude;
     };
 
     static std::string ExtractValue(std::string data, std::string delimiter, int pos)