michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: Fix SenML Json Name parser

Browse source 
Bug fix for case when base name is not included at message.

Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
This commit is contained in:
Juha Heiskanen 2022-03-03 08:25:49 -08:00 • committed by Carles Cufí
commit 3d44738b19
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
subsys/net/lib/lwm2m/lwm2m_rw_senml_json.c
View file

@ -1355,8 +1355,8 @@ int do_write_op_senml_json(struct lwm2m_message *msg)
struct json_in_formatter_data fd; struct json_in_formatter_data fd;
int ret = 0; int ret = 0;
uint8_t name[MAX_RESOURCE_LEN + 1]; uint8_t name[MAX_RESOURCE_LEN + 1];
uint8_t base_name[MAX_RESOURCE_LEN + 1]; uint8_t base_name[MAX_RESOURCE_LEN + 1] = {0};
uint8_t full_name[MAX_RESOURCE_LEN + 1]; uint8_t full_name[MAX_RESOURCE_LEN + 1] = {0};
struct lwm2m_obj_path resource_path; struct lwm2m_obj_path resource_path;
bool path_valid = false; bool path_valid = false;
bool data_value = false; bool data_value = false;
@ -1565,8 +1565,8 @@ static uint8_t json_parse_composite_read_paths(struct lwm2m_message *msg,
bool path_valid; bool path_valid;
int ret; int ret;
uint8_t name[MAX_RESOURCE_LEN]; uint8_t name[MAX_RESOURCE_LEN];
uint8_t base_name[MAX_RESOURCE_LEN]; uint8_t base_name[MAX_RESOURCE_LEN + 1] = {0};
uint8_t full_name[MAX_RESOURCE_LEN]; uint8_t full_name[MAX_RESOURCE_LEN + 1] = {0};
uint8_t valid_path_cnt = 0; uint8_t valid_path_cnt = 0;
while (json_next_token(&msg->in, &fd)) { while (json_next_token(&msg->in, &fd)) {