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

Init all sample pointers when reusing loan

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2019-07-27 13:08:12 +02:00 • committed by eboasson
parent 9cf4b97f1a
commit 9b1920862e
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/ddsc/src/dds_read.c
View file

@ -84,7 +84,10 @@ static dds_return_t dds_read_impl (bool take, dds_entity_t reader_or_condition,
if (rd->m_loan) if (rd->m_loan)
{ {
if (rd->m_loan_size >= maxs) if (rd->m_loan_size >= maxs)
buf[0] = rd->m_loan; {
/* This ensures buf is properly initialized */
ddsi_sertopic_realloc_samples (buf, rd->m_topic->m_stopic, rd->m_loan, rd->m_loan_size, rd->m_loan_size);
}
else else
{ {
ddsi_sertopic_realloc_samples (buf, rd->m_topic->m_stopic, rd->m_loan, rd->m_loan_size, maxs); ddsi_sertopic_realloc_samples (buf, rd->m_topic->m_stopic, rd->m_loan, rd->m_loan_size, maxs);

2
src/core/ddsc/src/dds_sertopic_builtintopic.c
View file

@ -93,7 +93,7 @@ static void sertopic_builtin_realloc_samples (void **ptrs, const struct ddsi_ser
{ {
const struct ddsi_sertopic_builtintopic *tp = (const struct ddsi_sertopic_builtintopic *)sertopic_common; const struct ddsi_sertopic_builtintopic *tp = (const struct ddsi_sertopic_builtintopic *)sertopic_common;
const size_t size = get_size (tp->type); const size_t size = get_size (tp->type);
char *new = dds_realloc (old, size * count); char *new = (oldcount == count) ? old : dds_realloc (old, size * count);
if (new && count > oldcount) if (new && count > oldcount)
memset (new + size * oldcount, 0, size * (count - oldcount)); memset (new + size * oldcount, 0, size * (count - oldcount));
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)

2
src/core/ddsi/src/ddsi_sertopic_default.c
View file

@ -42,7 +42,7 @@ static void sertopic_default_realloc_samples (void **ptrs, const struct ddsi_ser
{ {
const struct ddsi_sertopic_default *tp = (const struct ddsi_sertopic_default *)sertopic_common; const struct ddsi_sertopic_default *tp = (const struct ddsi_sertopic_default *)sertopic_common;
const size_t size = tp->type->m_size; const size_t size = tp->type->m_size;
char *new = dds_realloc (old, size * count); char *new = (oldcount == count) ? old : dds_realloc (old, size * count);
if (new && count > oldcount) if (new && count > oldcount)
memset (new + size * oldcount, 0, size * (count - oldcount)); memset (new + size * oldcount, 0, size * (count - oldcount));
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)