ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add missing null checks

pull/9507/head
paul-szczepanek-arm 2019-01-16 14:56:54 +00:00 committed by adbridge
parent 9a04abbb23
commit 5077d6faaf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/FEATURE_BLE/source/generic/GenericGap.cpp
View File

@ -1782,7 +1782,8 @@ void GenericGap::on_disconnection_complete(const pal::GapDisconnectionCompleteEv
void GenericGap::on_connection_parameter_request(const pal::GapRemoteConnectionParameterRequestEvent &e) void GenericGap::on_connection_parameter_request(const pal::GapRemoteConnectionParameterRequestEvent &e)
{ {
if (_user_manage_connection_parameter_requests) { if (_user_manage_connection_parameter_requests) {
_eventHandler->onUpdateConnectionParametersRequest( if (_eventHandler) {
_eventHandler->onUpdateConnectionParametersRequest(
UpdateConnectionParametersRequestEvent( UpdateConnectionParametersRequestEvent(
e.connection_handle, e.connection_handle,
conn_interval_t(e.min_connection_interval), conn_interval_t(e.min_connection_interval),
@ -1791,6 +1792,7 @@ void GenericGap::on_connection_parameter_request(const pal::GapRemoteConnectionP
supervision_timeout_t(e.supervision_timeout) supervision_timeout_t(e.supervision_timeout)
) )
); );
}
} else { } else {
_pal_gap.accept_connection_parameter_request( _pal_gap.accept_connection_parameter_request(
e.connection_handle, e.connection_handle,
@ -1806,6 +1808,10 @@ void GenericGap::on_connection_parameter_request(const pal::GapRemoteConnectionP
void GenericGap::on_connection_update(const pal::GapConnectionUpdateEvent &e) void GenericGap::on_connection_update(const pal::GapConnectionUpdateEvent &e)
{ {
if (!_eventHandler) {
return;
}
_eventHandler->onConnectionParametersUpdateComplete( _eventHandler->onConnectionParametersUpdateComplete(
ConnectionParametersUpdateCompleteEvent( ConnectionParametersUpdateCompleteEvent(
e.status == pal::hci_error_code_t::SUCCESS ? BLE_ERROR_NONE : BLE_ERROR_UNSPECIFIED, e.status == pal::hci_error_code_t::SUCCESS ? BLE_ERROR_NONE : BLE_ERROR_UNSPECIFIED,