Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

net/nanocoap: fix issues reported by scan-build #12584

Merged
merged 4 commits into from
Oct 30, 2019
Merged

net/nanocoap: fix issues reported by scan-build #12584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1aa1e2c
sys/net/nanocoap: return ENOENT if parsing option failed
aabadie Oct 27, 2019
5d1480a
sys/net/nanocoap: fail when start data cannot be parsed
aabadie Oct 27, 2019
95da51b
sys/net/nanocoap: fix potential use of uinitialized variable
aabadie Oct 27, 2019
8b06560
sys/net/nanocoap: correctly initialize array
aabadie Oct 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sys/include/net/nanocoap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,7 @@ ssize_t coap_opt_get_next(const coap_pkt_t *pkt, coap_optpos_t *opt,
*
* @return length of option; 0 if the option exists but is empty
* @return -ENOENT if option not found
* @return -EINVAL if option cannot be parsed
*/
ssize_t coap_opt_get_opaque(coap_pkt_t *pkt, unsigned opt_num, uint8_t **value);
/**@}*/
Expand Down
15 changes: 12 additions & 3 deletions sys/net/application_layer/nanocoap/nanocoap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@ ssize_t coap_opt_get_opaque(coap_pkt_t *pkt, unsigned opt_num, uint8_t **value)
int len;

*value = _parse_option(pkt, start, &delta, &len);
if (!*value) {
return -EINVAL;
}

return len;
}

Expand Down Expand Up @@ -355,6 +359,11 @@ int coap_get_blockopt(coap_pkt_t *pkt, uint16_t option, uint32_t *blknum, unsign
uint16_t delta;

uint8_t *data_start = _parse_option(pkt, optpos, &delta, &option_len);
if (!data_start) {
DEBUG("nanocoap: invalid start data\n");
return -1;
}

uint32_t blkopt = _decode_uint(data_start, option_len);

DEBUG("nanocoap: blkopt len: %i\n", option_len);
Expand Down Expand Up @@ -775,7 +784,7 @@ static ssize_t _add_opt_pkt(coap_pkt_t *pkt, uint16_t optnum, const uint8_t *val
assert(optnum >= lastonum);

/* calculate option length */
uint8_t dummy[3];
uint8_t dummy[3] = { 0 };
size_t optlen = _put_delta_optlen(dummy, 1, 4, optnum - lastonum);
optlen += _put_delta_optlen(dummy, 0, 0, val_len);
optlen += val_len;
Expand Down Expand Up @@ -893,8 +902,8 @@ void coap_block_slicer_init(coap_block_slicer_t *slicer, size_t blknum,

void coap_block2_init(coap_pkt_t *pkt, coap_block_slicer_t *slicer)
{
uint32_t blknum;
unsigned szx;
uint32_t blknum = 0;
unsigned szx = 0;

/* Retrieve the block2 option from the client request */
if (coap_get_blockopt(pkt, COAP_OPT_BLOCK2, &blknum, &szx) >= 0) {
Expand Down