Fix bug with misaligned memory access

Raimo33 · Mar 2, 2025 · 2bf823c · 2bf823c
1 parent b03e8f9
commit 2bf823c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/docs/building-and-testing/installation.md b/docs/building-and-testing/installation.md
@@ -6,7 +6,7 @@ To install FlashFIX you must compile it from source, as that will guarantee the
 
   - CMake 3.10 or later
   - gcc with c23 support
-  - CPU with unaligned memory access support
+  - CPU with misaligned memory access support
 
 ## Building
 

diff --git a/src/common.c b/src/common.c
@@ -5,7 +5,7 @@ Creator: Claudio Raimondi
 Email: [email protected]                                                   
 
 created at: 2025-02-24 16:35:15                                                 
-last edited: 2025-03-02 18:50:22                                                
+last edited: 2025-03-02 21:57:40                                                
 
 ================================================================================*/
 
@@ -42,12 +42,12 @@ uint8_t compute_checksum(const char *buffer,  const char *const end)
 {
   uint16_t remaining = end - buffer;
 
-  uint8_t unaligned_bytes = align_forward(buffer);
-  unaligned_bytes -= (unaligned_bytes > remaining) & (unaligned_bytes - remaining);
+  uint8_t misaligned_bytes = align_forward(buffer);
+  misaligned_bytes -= (misaligned_bytes > remaining) * (misaligned_bytes - remaining);
 
   uint8_t checksum = 0;
 
-  while (UNLIKELY(unaligned_bytes--))
+  while (UNLIKELY(misaligned_bytes--))
   {
     checksum += *buffer++;
     remaining--;

diff --git a/src/deserializer.c b/src/deserializer.c
@@ -5,7 +5,7 @@ Creator: Claudio Raimondi
 Email: [email protected]                                                   
 
 created at: 2025-02-11 12:37:26                                                 
-last edited: 2025-03-02 19:09:19                                                
+last edited: 2025-03-02 21:57:40                                                
 
 ================================================================================*/
 
@@ -116,10 +116,10 @@ static const char *get_checksum_start(const char *buffer, const uint16_t buffer_
 {
   uint16_t remaining = buffer_size - STR_LEN("10=000\x01") + 1;
 
-  uint8_t unaligned_bytes = align_forward(buffer);
-  unaligned_bytes -= (unaligned_bytes > remaining) & (unaligned_bytes - remaining);
+  uint8_t misaligned_bytes = align_forward(buffer);
+  misaligned_bytes -= (misaligned_bytes > remaining) * (misaligned_bytes - remaining);
 
-  while (UNLIKELY(unaligned_bytes--))
+  while (UNLIKELY(misaligned_bytes--))
   {
     if (buffer[0] == '1' && check_zero_equal_soh(buffer + 1))
       return buffer;