Skip to content
Snippets Groups Projects
Commit 261b9b8d authored by William Escande's avatar William Escande Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix a OOB bug in bta_hh_co_get_rpt_rsp"" into tm-dev

parents e8779817 a7ae837b
No related branches found
No related tags found
No related merge requests found
......@@ -661,14 +661,13 @@ void bta_hh_co_get_rpt_rsp(uint8_t dev_handle, uint8_t status, uint8_t* p_rpt,
ev.u.feature_answer.err = status;
ev.u.feature_answer.size = len;
osi_free(get_rpt_id);
if (len >= GET_RPT_RSP_OFFSET) {
if (len - GET_RPT_RSP_OFFSET > UHID_DATA_MAX) {
if (len > 0) {
if (len > UHID_DATA_MAX) {
APPL_TRACE_WARNING("%s: Report size greater than allowed size",
__func__);
return;
}
memcpy(ev.u.feature_answer.data, p_rpt + GET_RPT_RSP_OFFSET, len - GET_RPT_RSP_OFFSET);
memcpy(ev.u.feature_answer.data, p_rpt + GET_RPT_RSP_OFFSET, len);
uhid_write(p_dev->fd, &ev);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment