michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: Sufficient memory for resource names

Browse source 
Full resource names aren't as long as combined basename- and name-buffer
sizes but the compiler doesn't know it. Increasing the buffer size to
avoid the compiler warning.

Signed-off-by: Veijo Pesonen <veijo.pesonen@nordicsemi.no>
This commit is contained in:
Veijo Pesonen 2023-01-19 09:46:25 +02:00 • committed by Carles Cufí
commit f0258dbe4d
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c
View file

@ -713,7 +713,10 @@ static int do_write_op_item(struct lwm2m_message *msg, struct record *rec)
/* Composite op - name with basename */ /* Composite op - name with basename */
char name[SENML_MAX_NAME_SIZE] = { 0 }; /* Null terminated name */ char name[SENML_MAX_NAME_SIZE] = { 0 }; /* Null terminated name */
int len = 0; int len = 0;
char fqn[MAX_RESOURCE_LEN + 1] = {0}; /* Compiler requires reserving space for full length basename and name even though those two
* combined do not exceed MAX_RESOURCE_LEN
*/
char fqn[MAX_RESOURCE_LEN + SENML_MAX_NAME_SIZE + 1] = {0};
fd = engine_get_in_user_data(&msg->in); fd = engine_get_in_user_data(&msg->in);
if (!fd) { if (!fd) {
@ -819,7 +822,10 @@ static uint8_t parse_composite_read_paths(struct lwm2m_message *msg,
{ {
char basename[MAX_RESOURCE_LEN + 1] = {0}; /* to include terminating null */ char basename[MAX_RESOURCE_LEN + 1] = {0}; /* to include terminating null */
char name[MAX_RESOURCE_LEN + 1] = {0}; /* to include terminating null */ char name[MAX_RESOURCE_LEN + 1] = {0}; /* to include terminating null */
char fqn[MAX_RESOURCE_LEN + 1] = {0}; /* Compiler requires reserving space for full length basename and name even though those two
* combined do not exceed MAX_RESOURCE_LEN
*/
char fqn[2 * MAX_RESOURCE_LEN + 1] = {0};
struct lwm2m_obj_path path; struct lwm2m_obj_path path;
struct cbor_in_fmt_data *fd; struct cbor_in_fmt_data *fd;
uint8_t paths = 0; uint8_t paths = 0;