michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: mesh: Fix uninitialized variable error

Browse source 
This fixes the error below:

main.c: In function ‘bt_mesh_provision’:
main.c:173:17: error: ‘node’ may be used uninitialized in
	       this function [-Werror=maybe-uninitialized]
  173 |                 bt_mesh_cdb_node_del(node, true);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Signed-off-by: Mariusz Skamra <mariusz.skamra@codecoup.pl>
This commit is contained in:
Mariusz Skamra 2023-08-23 10:57:23 +02:00 • committed by Carles Cufí
commit c563e7a1b8
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/mesh/main.c
View file

@ -51,7 +51,6 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
struct bt_mesh_key mesh_net_key;
bool is_net_key_valid = false;
bool is_dev_key_valid = false;
bool is_cdb_dev_key_valid = false;
int err = 0;
if (!atomic_test_bit(bt_mesh.flags, BT_MESH_INIT)) {
@ -59,7 +58,7 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
}
struct bt_mesh_cdb_subnet *subnet = NULL;
struct bt_mesh_cdb_node *node;
struct bt_mesh_cdb_node *node = NULL;
LOG_INF("Primary Element: 0x%04x", addr);
LOG_DBG("net_idx 0x%04x flags 0x%02x iv_index 0x%04x", net_idx, flags, iv_index);
@ -122,7 +121,6 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
LOG_ERR("Failed to import cdb device key");
goto end;
}
is_cdb_dev_key_valid = true;
if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
bt_mesh_cdb_node_store(node);
@ -169,7 +167,7 @@ int bt_mesh_provision(const uint8_t net_key[16], uint16_t net_idx,
bt_mesh_start();
end:
if (err && is_cdb_dev_key_valid && IS_ENABLED(CONFIG_BT_MESH_CDB)) {
if (err && node != NULL && IS_ENABLED(CONFIG_BT_MESH_CDB)) {
bt_mesh_cdb_node_del(node, true);
}