mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

compoent/bt: Modify bta_gattc_utils.c The value pointer copy is overwritten when a write event occurs.

pull/1278/merge
Yulong 2017-11-09 01:44:16 -05:00 zatwierdzone przez yulong
rodzic e6b2c19eea
commit ee43527108
1 zmienionych plików z 16 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

26
components/bt/bluedroid/bta/gatt/bta_gattc_utils.c
Wyświetl plik

@ -461,17 +461,23 @@ BOOLEAN bta_gattc_enqueue(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
return FALSE; return FALSE;
} }
if (p_data->hdr.event == BTA_GATTC_API_WRITE_EVT) { if (p_data->hdr.event == BTA_GATTC_API_WRITE_EVT) {
len = p_data->api_write.len; len = p_data->api_write.len;
cmd_data = (tBTA_GATTC_DATA *)osi_malloc(sizeof(tBTA_GATTC_DATA) + len); if ((cmd_data = (tBTA_GATTC_DATA *)osi_malloc(sizeof(tBTA_GATTC_DATA) + len)) != NULL) {
memset(cmd_data, 0, sizeof(tBTA_GATTC_DATA) + len);
cmd_data->api_write.p_value = (UINT8 *)(cmd_data + 1); memcpy(cmd_data, p_data, sizeof(tBTA_GATTC_DATA));
memcpy(cmd_data, p_data, sizeof(tBTA_GATTC_DATA)); cmd_data->api_write.p_value = (UINT8 *)(cmd_data + 1);
memcpy(cmd_data->api_write.p_value, p_data->api_write.p_value, len); memcpy(cmd_data->api_write.p_value, p_data->api_write.p_value, len);
} else { } else {
cmd_data = (tBTA_GATTC_DATA *)osi_malloc(sizeof(tBTA_GATTC_DATA)); APPL_TRACE_ERROR("%s(), alloc fail, no memery.", __func__);
memset(cmd_data, 0, sizeof(tBTA_GATTC_DATA)); }
memcpy(cmd_data, p_data, sizeof(tBTA_GATTC_DATA)); } else {
if ((cmd_data = (tBTA_GATTC_DATA *)osi_malloc(sizeof(tBTA_GATTC_DATA))) != NULL) {
memset(cmd_data, 0, sizeof(tBTA_GATTC_DATA));
memcpy(cmd_data, p_data, sizeof(tBTA_GATTC_DATA));
} else {
APPL_TRACE_ERROR("%s(), alloc fail, no memery.", __func__);
}
} }
//store the command to the command list. //store the command to the command list.