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

Improve chance of catching uninitialized plist/qos

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-06-03 13:36:00 +02:00 • committed by eboasson
parent 4cc018cfd7
commit 99d1364145
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/ddsc/src/dds_whc.c
View file

@ -421,6 +421,10 @@ static ddsrt_mtime_t whc_deadline_missed_cb(void *hc, ddsrt_mtime_t tnow)
struct whc_writer_info *whc_make_wrinfo (struct dds_writer *wr, const dds_qos_t *qos) struct whc_writer_info *whc_make_wrinfo (struct dds_writer *wr, const dds_qos_t *qos)
{ {
struct whc_writer_info *wrinfo = ddsrt_malloc (sizeof (*wrinfo)); struct whc_writer_info *wrinfo = ddsrt_malloc (sizeof (*wrinfo));
assert (qos->present & QP_HISTORY);
assert (qos->present & QP_DEADLINE);
assert (qos->present & QP_DURABILITY);
assert (qos->present & QP_DURABILITY_SERVICE);
wrinfo->writer = wr; wrinfo->writer = wr;
wrinfo->is_transient_local = (qos->durability.kind == DDS_DURABILITY_TRANSIENT_LOCAL); wrinfo->is_transient_local = (qos->durability.kind == DDS_DURABILITY_TRANSIENT_LOCAL);
wrinfo->has_deadline = (qos->deadline.deadline != DDS_INFINITY); wrinfo->has_deadline = (qos->deadline.deadline != DDS_INFINITY);

21
src/core/ddsi/src/ddsi_plist.c
View file

@ -1912,8 +1912,6 @@ static void plist_or_xqos_fini (void * __restrict dst, size_t shift, uint64_t pm
entry->op.f.fini (dst, &dstoff, fs, entry->present_flag); entry->op.f.fini (dst, &dstoff, fs, entry->present_flag);
} }
} }
if (pfs.present) { *pfs.present &= ~pmask; *pfs.aliased &= ~pmask; }
*qfs.present &= ~qmask; *qfs.aliased &= ~qmask;
} }
static void plist_or_xqos_unalias (void * __restrict dst, size_t shift) static void plist_or_xqos_unalias (void * __restrict dst, size_t shift)
@ -2069,11 +2067,20 @@ static void plist_or_xqos_addtomsg (struct nn_xmsg *xmsg, const void * __restric
void ddsi_plist_fini (ddsi_plist_t *plist) void ddsi_plist_fini (ddsi_plist_t *plist)
{ {
plist_or_xqos_fini (plist, 0, ~(uint64_t)0, ~(uint64_t)0); plist_or_xqos_fini (plist, 0, ~(uint64_t)0, ~(uint64_t)0);
#ifndef NDEBUG
memset (plist, 0x55, sizeof (*plist));
plist->present = plist->aliased = ~(uint64_t)0;
plist->qos.present = plist->qos.aliased = ~(uint64_t)0;
#endif
} }
void ddsi_plist_fini_mask (ddsi_plist_t *plist, uint64_t pmask, uint64_t qmask) void ddsi_plist_fini_mask (ddsi_plist_t *plist, uint64_t pmask, uint64_t qmask)
{ {
plist_or_xqos_fini (plist, 0, pmask, qmask); plist_or_xqos_fini (plist, 0, pmask, qmask);
plist->present &= ~pmask;
plist->aliased &= ~pmask;
plist->qos.present &= ~qmask;
plist->qos.aliased &= ~qmask;
} }
void ddsi_plist_unalias (ddsi_plist_t *plist) void ddsi_plist_unalias (ddsi_plist_t *plist)
@ -2668,7 +2675,7 @@ ddsi_plist_t *ddsi_plist_dup (const ddsi_plist_t *src)
void ddsi_plist_init_empty (ddsi_plist_t *dest) void ddsi_plist_init_empty (ddsi_plist_t *dest)
{ {
#ifndef NDEBUG #ifndef NDEBUG
memset (dest, 0, sizeof (*dest)); memset (dest, 0x55, sizeof (*dest));
#endif #endif
dest->present = dest->aliased = 0; dest->present = dest->aliased = 0;
ddsi_xqos_init_empty (&dest->qos); ddsi_xqos_init_empty (&dest->qos);
@ -3010,7 +3017,7 @@ unsigned char *ddsi_plist_quickscan (struct nn_rsample_info *dest, const struct
void ddsi_xqos_init_empty (dds_qos_t *dest) void ddsi_xqos_init_empty (dds_qos_t *dest)
{ {
#ifndef NDEBUG #ifndef NDEBUG
memset (dest, 0, sizeof (*dest)); memset (dest, 0x55, sizeof (*dest));
#endif #endif
dest->present = dest->aliased = 0; dest->present = dest->aliased = 0;
} }
@ -3214,11 +3221,17 @@ void ddsi_xqos_copy (dds_qos_t *dst, const dds_qos_t *src)
void ddsi_xqos_fini (dds_qos_t *xqos) void ddsi_xqos_fini (dds_qos_t *xqos)
{ {
plist_or_xqos_fini (xqos, offsetof (ddsi_plist_t, qos), ~(uint64_t)0, ~(uint64_t)0); plist_or_xqos_fini (xqos, offsetof (ddsi_plist_t, qos), ~(uint64_t)0, ~(uint64_t)0);
#ifndef NDEBUG
memset (xqos, 0x55, sizeof (*xqos));
xqos->present = xqos->aliased = ~(uint64_t)0;
#endif
} }
void ddsi_xqos_fini_mask (dds_qos_t *xqos, uint64_t mask) void ddsi_xqos_fini_mask (dds_qos_t *xqos, uint64_t mask)
{ {
plist_or_xqos_fini (xqos, offsetof (ddsi_plist_t, qos), ~(uint64_t)0, mask); plist_or_xqos_fini (xqos, offsetof (ddsi_plist_t, qos), ~(uint64_t)0, mask);
xqos->present &= ~mask;
xqos->aliased &= ~mask;
} }
void ddsi_xqos_unalias (dds_qos_t *xqos) void ddsi_xqos_unalias (dds_qos_t *xqos)