Use correct functions to resize and get an item, avoiding memory leak…

…s in typesupport code (ros2#228) Signed-off-by: Chen.Lihui <[email protected]>
tier4 · Jun 3, 2021 · 7c569f4 · 7c569f4
1 parent c843299
commit 7c569f4
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 210 deletions.
diff --git a/rmw_cyclonedds_cpp/include/rmw_cyclonedds_cpp/TypeSupport.hpp b/rmw_cyclonedds_cpp/include/rmw_cyclonedds_cpp/TypeSupport.hpp
@@ -78,7 +78,7 @@ struct StringHelper<rosidl_typesupport_introspection_c__MessageMembers>
     return std::string(data.data);
   }
 
-  static void assign(cycdeser & deser, void * field, bool)
+  static void assign(cycdeser & deser, void * field)
   {
     std::string str;
     deser >> str;
@@ -98,12 +98,9 @@ struct StringHelper<rosidl_typesupport_introspection_cpp::MessageMembers>
     return *(static_cast<std::string *>(data));
   }
 
-  static void assign(cycdeser & deser, void * field, bool call_new)
+  static void assign(cycdeser & deser, void * field)
   {
     std::string & str = *(std::string *)field;
-    if (call_new) {
-      new(&str) std::string;
-    }
     deser >> str;
   }
 };
@@ -130,8 +127,7 @@ class TypeSupport
 
 private:
   bool deserializeROSmessage(
-    cycdeser & deser, const MembersType * members, void * ros_message,
-    bool call_new);
+    cycdeser & deser, const MembersType * members, void * ros_message);
   bool printROSmessage(
     cycprint & deser, const MembersType * members);
 };