github

Author: mikir

compiler/extensions/cpp/runtime/src/zserio/BitStreamWriter.cpp

@@ -637,7 +637,8 @@ inline void BitStreamWriter::writeVarNum(
         }
 
         const size_t shiftBits = (numVarBytes - (i + 1)) * 7 + ((hasMaxByteRange && hasNextByte) ? 1 : 0);
-        byte |= static_cast<uint8_t>((value >> shiftBits) & bitMasks[numBits - 1]);
+        uint8_t val = static_cast<uint8_t>((value >> shiftBits) & bitMasks[numBits - 1]);
+        byte = static_cast<uint8_t>(byte | val);
         writeUnsignedBits(byte, 8);
     }
 }

compiler/extensions/cpp/runtime/test/zserio/BitStreamWriterTest.cpp

@@ -135,8 +135,8 @@ TEST_F(BitStreamWriterTest, writeUnalignedData)
         uint8_t writtenTestValue = static_cast<uint8_t>(bitBuffer.getData()[offset / 8U] << (offset % 8U));
         if (offset % 8 != 0)
         {
-            writtenTestValue |=
-                    static_cast<uint8_t>(bitBuffer.getData()[offset / 8U + 1U] >> (8U - (offset % 8U)));
+            uint8_t val = static_cast<uint8_t>(bitBuffer.getData()[offset / 8U + 1U] >> (8U - (offset % 8U)));
+            writtenTestValue = static_cast<uint8_t>(writtenTestValue | val);
         }
         ASSERT_EQ(testValue, writtenTestValue) << "Offset: " << offset;
     }