Fixing failing tests on rmw_fastrtps_dynamic_cpp. (ros2#242)

* Fixing failing tests on rmw_fastrtps_dynamic_cpp. * linters
ross-desmond · Nov 30, 2018 · 214d6a5 · 214d6a5
1 parent c8ac74e
commit 214d6a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
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
@@ -641,7 +641,13 @@ inline void deserialize_field<std::string>(
     }
     deser >> *static_cast<std::string *>(field);
   } else if (member->array_size_ && !member->is_upper_bound_) {
-    deser.deserializeArray(static_cast<std::string *>(field), member->array_size_);
+    std::string * array = static_cast<std::string *>(field);
+    if (call_new) {
+      for (size_t i = 0; i < member->array_size_; ++i) {
+        new(&array[i]) std::string();
+      }
+    }
+    deser.deserializeArray(array, member->array_size_);
   } else {
     auto & vector = *reinterpret_cast<std::vector<std::string> *>(field);
     if (call_new) {

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_serialize.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_serialize.cpp
@@ -48,7 +48,8 @@ rmw_serialize(
     }
   }
 
-  eprosima::fastcdr::FastBuffer buffer(reinterpret_cast<char *>(serialized_message->buffer), data_length);
+  eprosima::fastcdr::FastBuffer buffer(reinterpret_cast<char *>(serialized_message->buffer),
+    data_length);
   eprosima::fastcdr::Cdr ser(
     buffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::Cdr::DDS_CDR);