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

always append 0 byte to user/group/topic data

Browse source 
Changes the semantics of dds_qget_{user,group,topic}data to always
append a 0 byte to any non-empty value without counting it in the size.
(An empty value is always represented by a null pointer and a size of
0).  The advantage is that any code treating the data as the octet
sequence it formally is will do exactly the same, but any code written
with the knowledge that it should be a string can safely interpret it as
one.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2019-04-16 15:22:04 +02:00 • committed by eboasson
parent 6c171a890d
commit 1672268481
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/ddsi/src/q_plist.c
View file

@ -144,7 +144,7 @@ static int validate_octetseq (const struct dd *dd, size_t *len)
if (dd->bufsz < offsetof (struct cdroctetseq, value))
return Q_ERR_INVALID;
*len = dd->bswap ? bswap4u (x->len) : x->len;
if (*len > dd->bufsz - offsetof (struct cdroctetseq, value))
if (*len > dd->bufsz - offsetof (struct cdroctetseq, value) || *len >= UINT32_MAX)
return Q_ERR_INVALID;
return 0;
}
@ -158,7 +158,7 @@ static int alias_octetseq (nn_octetseq_t *oseq, const struct dd *dd)
else
{
const struct cdroctetseq *x = (const struct cdroctetseq *) dd->buf;
assert(len <= UINT32_MAX); /* it really is an uint32_t on the wire */
assert(len < UINT32_MAX); /* it really is an uint32_t on the wire */
oseq->length = (uint32_t)len;
oseq->value = (len == 0) ? NULL : (unsigned char *) x->value;
return 0;
@ -167,7 +167,7 @@ static int alias_octetseq (nn_octetseq_t *oseq, const struct dd *dd)
static int alias_blob (nn_octetseq_t *oseq, const struct dd *dd)
{
assert (dd->bufsz <= UINT32_MAX);
assert (dd->bufsz < UINT32_MAX);
oseq->length = (uint32_t)dd->bufsz;
oseq->value = (oseq->length == 0) ? NULL : (unsigned char *) dd->buf;
return 0;