Capture std::bad_alloc on deserializeROSmessage. (#665)

* Capture bad_alloc on deserializeROSmessage. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 4d0be32)
ros2 · Jan 16, 2024 · 202244e · 202244e
1 parent a70758e
commit 202244e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/rmw_fastrtps_cpp/src/type_support_common.cpp b/rmw_fastrtps_cpp/src/type_support_common.cpp
@@ -119,6 +119,11 @@ bool TypeSupport::deserializeROSmessage(
       "Fast CDR exception deserializing message of type %s.",
       getName());
     return false;
+  } catch (const std::bad_alloc &) {
+    RMW_SET_ERROR_MSG_WITH_FORMAT_STRING(
+      "'Bad alloc' exception deserializing message of type %s.",
+      getName());
+    return false;
   }
 
   return true;

diff --git a/rmw_fastrtps_dynamic_cpp/include/rmw_fastrtps_dynamic_cpp/TypeSupport_impl.hpp b/rmw_fastrtps_dynamic_cpp/include/rmw_fastrtps_dynamic_cpp/TypeSupport_impl.hpp
@@ -983,6 +983,11 @@ bool TypeSupport<MembersType>::deserializeROSmessage(
       "Fast CDR exception deserializing message of type %s.",
       getName());
     return false;
+  } catch (const std::bad_alloc &) {
+    RMW_SET_ERROR_MSG_WITH_FORMAT_STRING(
+      "'Bad alloc' exception deserializing message of type %s.",
+      getName());
+    return false;
   }
 
   return true;