michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Fix dereferencing pointer before checking for NULL

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.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2020-04-02 16:39:12 +03:00 • committed by Johan Hedberg
commit 329d5908a2
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsys/bluetooth/mesh/access.c
View file

@ -705,7 +705,6 @@ 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; struct bt_mesh_app_key *key;
struct bt_mesh_msg_ctx ctx = { struct bt_mesh_msg_ctx ctx = {
.send_rel = pub->send_rel,
}; };
struct bt_mesh_net_tx tx = { struct bt_mesh_net_tx tx = {
.ctx = &ctx, .ctx = &ctx,
@ -743,6 +742,7 @@ int bt_mesh_model_publish(struct bt_mesh_model *model)
ctx.addr = pub->addr; ctx.addr = pub->addr;
ctx.send_ttl = pub->ttl; ctx.send_ttl = pub->ttl;
ctx.send_rel = pub->send_rel;
ctx.net_idx = key->net_idx; ctx.net_idx = key->net_idx;
ctx.app_idx = key->app_idx; ctx.app_idx = key->app_idx;