Fixing failing tests on rmw_fastrtps_dynamic_cpp.

ros2 · Nov 27, 2018 · 43cc32e · 43cc32e
1 parent f6cb095
commit 43cc32e
Showing 1 changed file with 7 additions and 1 deletion.
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) {