Skip to content

Commit

Permalink
Merge branch 'bugfix/btdm_malloc_fail_lead_to_crash' into 'release/v3.0'
Browse files Browse the repository at this point in the history
component/bt: Fix malloc fail lead to crash

See merge request idf/esp-idf!2487
  • Loading branch information
jack0c committed Jun 1, 2018
2 parents 5b2fee1 + 2bd198d commit c2b39f4
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions components/bt/bluedroid/btc/profile/std/gatt/btc_gatts.c
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,8 @@ static void btc_gatts_cb_param_copy_req(btc_msg_t *msg, void *p_dest, void *p_sr
if (p_dest_data->req_data.p_data != NULL) {
memcpy(p_dest_data->req_data.p_data, p_src_data->req_data.p_data,
sizeof(tBTA_GATTS_REQ_DATA));
} else {
LOG_ERROR("%s %d no mem\n", __func__, msg->act);
}
break;

Expand Down Expand Up @@ -759,6 +761,9 @@ void btc_gatts_cb_handler(btc_msg_t *msg)
param.write.conn_id = BTC_GATT_GET_CONN_ID(p_data->req_data.conn_id);
param.write.trans_id = p_data->req_data.trans_id;
memcpy(param.write.bda, p_data->req_data.remote_bda, ESP_BD_ADDR_LEN);
if (p_data->req_data.p_data == NULL) {
break;
}
param.write.handle = p_data->req_data.p_data->write_req.handle;
param.write.offset = p_data->req_data.p_data->write_req.offset;
param.write.need_rsp = p_data->req_data.p_data->write_req.need_rsp;
Expand All @@ -775,6 +780,9 @@ void btc_gatts_cb_handler(btc_msg_t *msg)
param.exec_write.conn_id = BTC_GATT_GET_CONN_ID(p_data->req_data.conn_id);
param.exec_write.trans_id = p_data->req_data.trans_id;
memcpy(param.exec_write.bda, p_data->req_data.remote_bda, ESP_BD_ADDR_LEN);
if (p_data->req_data.p_data == NULL) {
break;
}
param.exec_write.exec_write_flag = p_data->req_data.p_data->exec_write;

btc_gatts_cb_to_app(ESP_GATTS_EXEC_WRITE_EVT, gatts_if, &param);
Expand Down

0 comments on commit c2b39f4

Please sign in to comment.