patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

net: lwm2m: Ensure string termination when reading empty data

Browse source 
When resource data length is set to zero, we still need to
ensure that string reading will return an empty string.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>
This commit is contained in:
Seppo Takalo 2023-06-28 16:49:11 +03:00 committed by Fabio Baltieri
parent 95ca082e64
commit 37f145a2d9
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
subsys/net/lib/lwm2m/lwm2m_registry.c
View file

@ -1156,8 +1156,8 @@ static int lwm2m_engine_get(const struct lwm2m_obj_path *path, void *buf, uint16
break;
case LWM2M_RES_TYPE_STRING:
strncpy(buf, data_ptr, buflen - 1);
((char *)buf)[buflen - 1] = '\0';
strncpy(buf, data_ptr, data_len - 1);
((char *)buf)[data_len - 1] = '\0';
break;
case LWM2M_RES_TYPE_U32:
@ -1230,6 +1230,9 @@ static int lwm2m_engine_get(const struct lwm2m_obj_path *path, void *buf, uint16
k_mutex_unlock(&registry_lock);
return -EINVAL;
}
} else if (obj_field->data_type == LWM2M_RES_TYPE_STRING) {
/* Ensure empty string when there is no data */
((char *)buf)[0] = '\0';
}
k_mutex_unlock(&registry_lock);
return 0;