Fix UB in array related methods (#313) (#314)

mergify[bot] · cferreiragonz · web-flow · commit fa3331f55d76 · 2026-05-19T10:17:24.000+02:00
* Refs #24365: Fix UB in calculate_array_serialized_size * Refs #24365: Fix UB in serialize array * Refs #24365: Unrelated Uncrustify * Refs #24365: Revision * Refs #24365: Unrelated Uncrustify FastCdr.h --------- (cherry picked from commit a9bd70c) Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com> Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
diff --git a/include/fastcdr/Cdr.h b/include/fastcdr/Cdr.h
@@ -720,7 +720,7 @@ class Cdr
      * @exception exception::NotEnoughMemoryException This exception is thrown when trying to encode into a buffer
      * position that exceeds the internal memory size.
      */
-    template <size_t MAX_CHARS>
+    template<size_t MAX_CHARS>
     Cdr& serialize(
             const fixed_string<MAX_CHARS>& value)
     {
@@ -1787,7 +1787,7 @@ class Cdr
      * @exception exception::NotEnoughMemoryException This exception is thrown when trying to decode from a buffer
      * position that exceeds the internal memory size.
      */
-    template <size_t MAX_CHARS>
+    template<size_t MAX_CHARS>
     Cdr& deserialize(
             fixed_string<MAX_CHARS>& value)
     {
@@ -2973,6 +2973,10 @@ class Cdr
             const std::array<_T, _Size>* array_t,
             size_t num_elements)
     {
+        if (num_elements == 0 || array_t == nullptr)
+        {
+            return *this;
+        }
         return serialize_array(array_t->data(), num_elements * array_t->size());
     }
 
@@ -2988,6 +2992,10 @@ class Cdr
             std::array<_T, _Size>* array_t,
             size_t num_elements)
     {
+        if (num_elements == 0 || array_t == nullptr)
+        {
+            return *this;
+        }
         return deserialize_array(array_t->data(), num_elements * array_t->size());
     }
 
@@ -3005,6 +3013,10 @@ class Cdr
             size_t num_elements,
             Endianness endianness)
     {
+        if (num_elements == 0 || array_t == nullptr)
+        {
+            return *this;
+        }
         return deserialize_array(array_t->data(), num_elements * array_t->size(), endianness);
     }
 
diff --git a/include/fastcdr/CdrSizeCalculator.hpp b/include/fastcdr/CdrSizeCalculator.hpp
@@ -480,7 +480,7 @@ class CdrSizeCalculator
      * @param[inout] current_alignment Current alignment in the encoding.
      * @return Encoded size of the instance.
      */
-    template <size_t MAX_CHARS>
+    template<size_t MAX_CHARS>
     size_t calculate_serialized_size(
             const fixed_string<MAX_CHARS>& data,
             size_t& current_alignment)
@@ -1065,7 +1065,11 @@ class CdrSizeCalculator
             size_t num_elements,
             size_t& current_alignment)
     {
-        return calculate_array_serialized_size(data->data(), num_elements * data->size(), current_alignment);
+        if (num_elements == 0 || data == nullptr)
+        {
+            return 0;
+        }
+        return calculate_array_serialized_size(data->data(), num_elements * _N, current_alignment);
     }
 
     /*!
diff --git a/include/fastcdr/FastCdr.h b/include/fastcdr/FastCdr.h
@@ -655,7 +655,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -702,7 +703,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -736,7 +738,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -783,7 +786,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -804,7 +808,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -825,7 +830,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -850,7 +856,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -1306,7 +1313,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -1353,7 +1361,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -1387,7 +1396,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -1437,7 +1447,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -1458,7 +1469,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -1479,7 +1491,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -1503,7 +1516,8 @@ class Cdr_DllAPI FastCdr
             return *this;
         }
 
-        throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
+        throw exception::NotEnoughMemoryException(
+                  exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);
     }
 
     /*!
@@ -2047,6 +2061,10 @@ class Cdr_DllAPI FastCdr
             const std::array<_T, _Size>* array_t,
             size_t num_elements)
     {
+        if (num_elements == 0 || array_t == nullptr)
+        {
+            return *this;
+        }
         return serialize_array(array_t->data(), num_elements * array_t->size());
     }
 
@@ -2062,6 +2080,10 @@ class Cdr_DllAPI FastCdr
             std::array<_T, _Size>* array_t,
             size_t num_elements)
     {
+        if (num_elements == 0 || array_t == nullptr)
+        {
+            return *this;
+        }
         return deserialize_array(array_t->data(), num_elements * array_t->size());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,7 @@ class Cdr`
`720`	`720`	`* @exception exception::NotEnoughMemoryException This exception is thrown when trying to encode into a buffer`
`721`	`721`	`* position that exceeds the internal memory size.`
`722`	`722`	`*/`
`723`		`- template <size_t MAX_CHARS>`
	`723`	`+ template<size_t MAX_CHARS>`
`724`	`724`	`Cdr& serialize(`
`725`	`725`	`const fixed_string<MAX_CHARS>& value)`
`726`	`726`	`{`
`@@ -1787,7 +1787,7 @@ class Cdr`
`1787`	`1787`	`* @exception exception::NotEnoughMemoryException This exception is thrown when trying to decode from a buffer`
`1788`	`1788`	`* position that exceeds the internal memory size.`
`1789`	`1789`	`*/`
`1790`		`- template <size_t MAX_CHARS>`
	`1790`	`+ template<size_t MAX_CHARS>`
`1791`	`1791`	`Cdr& deserialize(`
`1792`	`1792`	`fixed_string<MAX_CHARS>& value)`
`1793`	`1793`	`{`
`@@ -2973,6 +2973,10 @@ class Cdr`
`2973`	`2973`	`const std::array<_T, _Size>* array_t,`
`2974`	`2974`	`size_t num_elements)`
`2975`	`2975`	`{`
	`2976`	`+ if (num_elements == 0 \|\| array_t == nullptr)`
	`2977`	`+ {`
	`2978`	`+ return *this;`
	`2979`	`+ }`
`2976`	`2980`	`return serialize_array(array_t->data(), num_elements * array_t->size());`
`2977`	`2981`	`}`
`2978`	`2982`
`@@ -2988,6 +2992,10 @@ class Cdr`
`2988`	`2992`	`std::array<_T, _Size>* array_t,`
`2989`	`2993`	`size_t num_elements)`
`2990`	`2994`	`{`
	`2995`	`+ if (num_elements == 0 \|\| array_t == nullptr)`
	`2996`	`+ {`
	`2997`	`+ return *this;`
	`2998`	`+ }`
`2991`	`2999`	`return deserialize_array(array_t->data(), num_elements * array_t->size());`
`2992`	`3000`	`}`
`2993`	`3001`
`@@ -3005,6 +3013,10 @@ class Cdr`
`3005`	`3013`	`size_t num_elements,`
`3006`	`3014`	`Endianness endianness)`
`3007`	`3015`	`{`
	`3016`	`+ if (num_elements == 0 \|\| array_t == nullptr)`
	`3017`	`+ {`
	`3018`	`+ return *this;`
	`3019`	`+ }`
`3008`	`3020`	`return deserialize_array(array_t->data(), num_elements * array_t->size(), endianness);`
`3009`	`3021`	`}`
`3010`	`3022`
Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,8 @@ class Cdr_DllAPI FastCdr`
`655`	`655`	`return *this;`
`656`	`656`	`}`
`657`	`657`
`658`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`658`	`+ throw exception::NotEnoughMemoryException(`
	`659`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`659`	`660`	`}`
`660`	`661`
`661`	`662`	`/*!`
`@@ -702,7 +703,8 @@ class Cdr_DllAPI FastCdr`
`702`	`703`	`return *this;`
`703`	`704`	`}`
`704`	`705`
`705`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`706`	`+ throw exception::NotEnoughMemoryException(`
	`707`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`706`	`708`	`}`
`707`	`709`
`708`	`710`	`/*!`
`@@ -736,7 +738,8 @@ class Cdr_DllAPI FastCdr`
`736`	`738`	`return *this;`
`737`	`739`	`}`
`738`	`740`
`739`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`741`	`+ throw exception::NotEnoughMemoryException(`
	`742`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`740`	`743`	`}`
`741`	`744`
`742`	`745`	`/*!`
`@@ -783,7 +786,8 @@ class Cdr_DllAPI FastCdr`
`783`	`786`	`return *this;`
`784`	`787`	`}`
`785`	`788`
`786`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`789`	`+ throw exception::NotEnoughMemoryException(`
	`790`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`787`	`791`	`}`
`788`	`792`
`789`	`793`	`/*!`
`@@ -804,7 +808,8 @@ class Cdr_DllAPI FastCdr`
`804`	`808`	`return *this;`
`805`	`809`	`}`
`806`	`810`
`807`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`811`	`+ throw exception::NotEnoughMemoryException(`
	`812`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`808`	`813`	`}`
`809`	`814`
`810`	`815`	`/*!`
`@@ -825,7 +830,8 @@ class Cdr_DllAPI FastCdr`
`825`	`830`	`return *this;`
`826`	`831`	`}`
`827`	`832`
`828`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`833`	`+ throw exception::NotEnoughMemoryException(`
	`834`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`829`	`835`	`}`
`830`	`836`
`831`	`837`	`/*!`
`@@ -850,7 +856,8 @@ class Cdr_DllAPI FastCdr`
`850`	`856`	`return *this;`
`851`	`857`	`}`
`852`	`858`
`853`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`859`	`+ throw exception::NotEnoughMemoryException(`
	`860`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`854`	`861`	`}`
`855`	`862`
`856`	`863`	`/*!`
`@@ -1306,7 +1313,8 @@ class Cdr_DllAPI FastCdr`
`1306`	`1313`	`return *this;`
`1307`	`1314`	`}`
`1308`	`1315`
`1309`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`1316`	`+ throw exception::NotEnoughMemoryException(`
	`1317`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`1310`	`1318`	`}`
`1311`	`1319`
`1312`	`1320`	`/*!`
`@@ -1353,7 +1361,8 @@ class Cdr_DllAPI FastCdr`
`1353`	`1361`	`return *this;`
`1354`	`1362`	`}`
`1355`	`1363`
`1356`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`1364`	`+ throw exception::NotEnoughMemoryException(`
	`1365`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`1357`	`1366`	`}`
`1358`	`1367`
`1359`	`1368`	`/*!`
`@@ -1387,7 +1396,8 @@ class Cdr_DllAPI FastCdr`
`1387`	`1396`	`return *this;`
`1388`	`1397`	`}`
`1389`	`1398`
`1390`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`1399`	`+ throw exception::NotEnoughMemoryException(`
	`1400`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`1391`	`1401`	`}`
`1392`	`1402`
`1393`	`1403`	`/*!`
`@@ -1437,7 +1447,8 @@ class Cdr_DllAPI FastCdr`
`1437`	`1447`	`return *this;`
`1438`	`1448`	`}`
`1439`	`1449`
`1440`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`1450`	`+ throw exception::NotEnoughMemoryException(`
	`1451`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`1441`	`1452`	`}`
`1442`	`1453`
`1443`	`1454`	`/*!`
`@@ -1458,7 +1469,8 @@ class Cdr_DllAPI FastCdr`
`1458`	`1469`	`return *this;`
`1459`	`1470`	`}`
`1460`	`1471`
`1461`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`1472`	`+ throw exception::NotEnoughMemoryException(`
	`1473`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`1462`	`1474`	`}`
`1463`	`1475`
`1464`	`1476`	`/*!`
`@@ -1479,7 +1491,8 @@ class Cdr_DllAPI FastCdr`
`1479`	`1491`	`return *this;`
`1480`	`1492`	`}`
`1481`	`1493`
`1482`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`1494`	`+ throw exception::NotEnoughMemoryException(`
	`1495`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`1483`	`1496`	`}`
`1484`	`1497`
`1485`	`1498`	`/*!`
`@@ -1503,7 +1516,8 @@ class Cdr_DllAPI FastCdr`
`1503`	`1516`	`return *this;`
`1504`	`1517`	`}`
`1505`	`1518`
`1506`		`- throw exception::NotEnoughMemoryException(exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
	`1519`	`+ throw exception::NotEnoughMemoryException(`
	`1520`	`+ exception::NotEnoughMemoryException::NOT_ENOUGH_MEMORY_MESSAGE_DEFAULT);`
`1507`	`1521`	`}`
`1508`	`1522`
`1509`	`1523`	`/*!`
`@@ -2047,6 +2061,10 @@ class Cdr_DllAPI FastCdr`
`2047`	`2061`	`const std::array<_T, _Size>* array_t,`
`2048`	`2062`	`size_t num_elements)`
`2049`	`2063`	`{`
	`2064`	`+ if (num_elements == 0 \|\| array_t == nullptr)`
	`2065`	`+ {`
	`2066`	`+ return *this;`
	`2067`	`+ }`
`2050`	`2068`	`return serialize_array(array_t->data(), num_elements * array_t->size());`
`2051`	`2069`	`}`
`2052`	`2070`
`@@ -2062,6 +2080,10 @@ class Cdr_DllAPI FastCdr`
`2062`	`2080`	`std::array<_T, _Size>* array_t,`
`2063`	`2081`	`size_t num_elements)`
`2064`	`2082`	`{`
	`2083`	`+ if (num_elements == 0 \|\| array_t == nullptr)`
	`2084`	`+ {`
	`2085`	`+ return *this;`
	`2086`	`+ }`
`2065`	`2087`	`return deserialize_array(array_t->data(), num_elements * array_t->size());`
`2066`	`2088`	`}`
`2067`	`2089`