obgm/libcoap
2
0 Fork 0
mirror of https://github.com/obgm/libcoap.git synced 2026-11-04 08:55:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

block.h: Make COAP_OPT_BLOCK_* functions safe against NULL indirects

Browse Source 
COAP_OPT_BLOCK_LAST(opt) may return NULL, so doing *COAP_OPT_BLOCK_LAST(opt)
is unsafe. Replace indirect with COAP_OPT_BLOCK_END_BYTE(opt).
This commit is contained in:
Jon Shallow authored and Jon Shallow committed 2023-05-11 09:00:53 +01:00
1 parent 4ef0705ccd
commit dbf78b526f
2 files changed
+8 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/coap3/block.h
+7 -2
View File
@@ -70,13 +70,18 @@ typedef struct {
#define COAP_OPT_BLOCK_LAST(opt) \
(coap_opt_length(opt) ? (coap_opt_value(opt) + (coap_opt_length(opt)-1)) : 0)
/** Returns the value of the last byte of @p opt. */
#define COAP_OPT_BLOCK_END_BYTE(opt) \
((coap_opt_length(opt) && coap_opt_value(opt)) ? \
*(coap_opt_value(opt) + (coap_opt_length(opt)-1)) : 0)
/** Returns the value of the More-bit of a Block option @p opt. */
#define COAP_OPT_BLOCK_MORE(opt) \
(coap_opt_length(opt) ? (*COAP_OPT_BLOCK_LAST(opt) & 0x08) : 0)
(coap_opt_length(opt) ? (COAP_OPT_BLOCK_END_BYTE(opt) & 0x08) : 0)
/** Returns the value of the SZX-field of a Block option @p opt. */
#define COAP_OPT_BLOCK_SZX(opt) \
(coap_opt_length(opt) ? (*COAP_OPT_BLOCK_LAST(opt) & 0x07) : 0)
(coap_opt_length(opt) ? (COAP_OPT_BLOCK_END_BYTE(opt) & 0x07) : 0)
/**
* Returns the value of field @c num in the given block option @p block_opt.
src/block.c
+1 -1
View File
@@ -39,7 +39,7 @@ coap_opt_block_num(const coap_opt_t *block_opt) {
coap_opt_length(block_opt) - 1);
}
return (num << 4) | ((*COAP_OPT_BLOCK_LAST(block_opt) & 0xF0) >> 4);
return (num << 4) | ((COAP_OPT_BLOCK_END_BYTE(block_opt) & 0xF0) >> 4);
}
int