Fix mutable size-three optional serialization

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
eProsima · Dec 12, 2024 · ceced5a · ceced5a
1 parent 0cb11a4
commit ceced5a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/include/fastcdr/CdrSizeCalculator.hpp b/include/fastcdr/CdrSizeCalculator.hpp
@@ -1245,12 +1245,14 @@ class CdrSizeCalculator
         if (CdrVersion::XCDRv2 == cdr_version_ && EncodingAlgorithmFlag::PL_CDR2 == current_encoding_ &&
                 0 < calculated_size)
         {
-            if (8 < calculated_size)
+            if (8 < calculated_size ||
+                    (1 != calculated_size && 2 != calculated_size && 4 != calculated_size &&
+                    8 != calculated_size))
             {
                 extra_size = 8; // Long EMHEADER.
                 if (NO_SERIALIZED_MEMBER_SIZE != serialized_member_size_)
                 {
-                    extra_size -= 4; // Join NEXTINT and DHEADER.
+                    calculated_size -= 4; // Join NEXTINT and DHEADER.
                 }
             }
             else