Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ble_mesh: Fix dereferencing pointer before checking for NULL [Zephyr]

Browse source 
The publication context is checked for NULL in bt_mesh_model_publish()
however it was dereferenced before that. Move the assignment to
ctx.send_rel to the same place where other ctx members are set.
This commit is contained in:
lly 2020-04-03 16:58:12 +08:00
parent 8f5564af84
commit cffbc32253
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/bt/esp_ble_mesh/mesh_core/access.c
View file

@ -1032,9 +1032,7 @@ int bt_mesh_model_publish(struct bt_mesh_model *model)
struct bt_mesh_model_pub *pub = model->pub; struct bt_mesh_model_pub *pub = model->pub;
struct bt_mesh_app_key *key = NULL; struct bt_mesh_app_key *key = NULL;
struct net_buf_simple *sdu = NULL; struct net_buf_simple *sdu = NULL;
struct bt_mesh_msg_ctx ctx = { struct bt_mesh_msg_ctx ctx = {0};
.send_rel = pub->send_rel,
};
struct bt_mesh_net_tx tx = { struct bt_mesh_net_tx tx = {
.sub = NULL, .sub = NULL,
.ctx = &ctx, .ctx = &ctx,
@ -1072,6 +1070,7 @@ int bt_mesh_model_publish(struct bt_mesh_model *model)
} }
ctx.addr = pub->addr; ctx.addr = pub->addr;
ctx.send_rel = pub->send_rel;
ctx.send_ttl = pub->ttl; ctx.send_ttl = pub->ttl;
ctx.net_idx = key->net_idx; ctx.net_idx = key->net_idx;
ctx.app_idx = key->app_idx; ctx.app_idx = key->app_idx;