niklas/rmw_cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Serialize into initialized memory, not vector (#75)

Browse source 
Make serdata a private header
Serialize into uninitialize data, not a vector.
This commit is contained in:
Dan Rose 2019-12-06 10:21:18 -06:00 • committed by GitHub
parent 88e74c322f
commit b322f478de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 91 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -54,7 +54,7 @@
#include "dds/dds.h"
#include "dds/ddsi/ddsi_sertopic.h"
#include "rmw_cyclonedds_cpp/serdes.hpp"
#include "rmw_cyclonedds_cpp/serdata.hpp"
#include "serdata.hpp"
/* Proper multi-domain support requires eliminating the "extra" participant, which in turn relies on
the promotion of the Cyclone DDS library instance and the daomsin to full-fledged entities. The
@ -1651,15 +1651,15 @@ static rmw_ret_t rmw_take_ser_int(
memcpy(message_info->publisher_gid.data, &info.publication_handle,
sizeof(info.publication_handle));
}
auto d = static_cast<struct serdata_rmw *>(dcmn);
auto d = static_cast<serdata_rmw *>(dcmn);
/* FIXME: what about the header - should be included or not? */
if (rmw_serialized_message_resize(serialized_message, d->data.size()) != RMW_RET_OK) {
if (rmw_serialized_message_resize(serialized_message, d->size()) != RMW_RET_OK) {
ddsi_serdata_unref(dcmn);
*taken = false;
return RMW_RET_ERROR;
}
memcpy(serialized_message->buffer, d->data.data(), d->data.size());
serialized_message->buffer_length = d->data.size();
memcpy(serialized_message->buffer, d->data(), d->size());
serialized_message->buffer_length = d->size();
ddsi_serdata_unref(dcmn);
*taken = true;
return RMW_RET_OK;