michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: Avoid using out-of-scope pointer

Browse source 
Mkae sure that variable pointed by params is valid when passing it
as function argument.

Fixes #10587

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
This commit is contained in:
Szymon Janc 2018-10-18 19:31:11 +02:00 • committed by Johan Hedberg
commit 30ce313482
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/host/conn.c
View file

@ -238,14 +238,16 @@ static void conn_le_update_timeout(struct k_work *work)
conn->le.interval_max, conn->le.interval_max,
conn->le.latency, conn->le.latency,
conn->le.timeout); conn->le.timeout);
send_conn_le_param_update(conn, param);
} else { } else {
param = BT_LE_CONN_PARAM(CONFIG_BT_PERIPHERAL_PREF_MIN_INT, param = BT_LE_CONN_PARAM(CONFIG_BT_PERIPHERAL_PREF_MIN_INT,
CONFIG_BT_PERIPHERAL_PREF_MAX_INT, CONFIG_BT_PERIPHERAL_PREF_MAX_INT,
CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY, CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY,
CONFIG_BT_PERIPHERAL_PREF_TIMEOUT); CONFIG_BT_PERIPHERAL_PREF_TIMEOUT);
}
send_conn_le_param_update(conn, param); send_conn_le_param_update(conn, param);
}
#else #else
/* update only if application set own params */ /* update only if application set own params */
if (atomic_test_and_clear_bit(conn->flags, BT_CONN_SLAVE_PARAM_SET)) { if (atomic_test_and_clear_bit(conn->flags, BT_CONN_SLAVE_PARAM_SET)) {