Skip to content

[24365] Fix UB in serialization methods #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MiguelCompany merged 5 commits into from
May 19, 2026
Merged

[24365] Fix UB in serialization methods #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8584d7c
Refs #24365: Fix UB in calculate_array_serialized_size
cferreiragonz May 18, 2026
f889a8b
Refs #24365: Fix UB in serialize array
cferreiragonz May 19, 2026
2cb501c
Refs #24365: Unrelated Uncrustify
cferreiragonz May 19, 2026
1de8525
Refs #24365: Revision
cferreiragonz May 19, 2026
38e7db9
Refs #24365: Unrelated Uncrustify FastCdr.h
cferreiragonz May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions include/fastcdr/Cdr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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());
}

Expand All @@ -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());
}

Expand All @@ -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);
}

Expand Down
8 changes: 6 additions & 2 deletions include/fastcdr/CdrSizeCalculator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
}

/*!
Expand Down
50 changes: 36 additions & 14 deletions include/fastcdr/FastCdr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*!
Expand Down Expand Up @@ -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);
}

/*!
Expand Down Expand Up @@ -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);
}

/*!
Expand Down Expand Up @@ -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);
}

/*!
Expand All @@ -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);
}

/*!
Expand All @@ -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);
}

/*!
Expand All @@ -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);
}

/*!
Expand Down Expand Up @@ -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);
}

/*!
Expand Down Expand Up @@ -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);
}

/*!
Expand Down Expand Up @@ -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);
}

/*!
Expand Down Expand Up @@ -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);
}

/*!
Expand All @@ -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);
}

/*!
Expand All @@ -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);
}

/*!
Expand All @@ -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);
}

/*!
Expand Down Expand Up @@ -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());
}

Expand All @@ -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());
}

Expand Down
Loading