michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: fix reading multiple objects that don't start at 0

Browse source 
Let's correct the starting logic in do_read_op() to not assume
a default value of 0 will be present for the first object, when
reading multiple objects.

Signed-off-by: Michael Scott <mike@foundries.io>
This commit is contained in:
Michael Scott 2018-08-27 17:09:32 -07:00 • committed by Anas Nashif
commit 485bf7a7eb
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_engine.c
View file

@ -2707,7 +2707,7 @@ static int do_read_op(struct lwm2m_engine_obj *obj,
{
struct lwm2m_output_context *out = context->out;
struct lwm2m_obj_path *path = context->path;
struct lwm2m_engine_obj_inst *obj_inst;
struct lwm2m_engine_obj_inst *obj_inst = NULL;
int ret = 0, index;
u8_t num_read = 0;
u8_t initialized;
@ -2715,7 +2715,13 @@ static int do_read_op(struct lwm2m_engine_obj *obj,
struct lwm2m_engine_obj_field *obj_field;
u16_t temp_res_id, temp_len;
obj_inst = get_engine_obj_inst(path->obj_id, path->obj_inst_id);
if (path->level >= 2) {
obj_inst = get_engine_obj_inst(path->obj_id, path->obj_inst_id);
} else if (path->level == 1) {
/* find first obj_inst with path's obj_id */
obj_inst = next_engine_obj_inst(path->obj_id, -1);
}
if (!obj_inst) {
return -ENOENT;
}