shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

dont trust wIndex

Browse Source
This commit is contained in:
Conor Patrick 2018-12-30 23:08:03 -05:00
parent 05d99120cd
commit 80934f3e3b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
targets/stm32l442/lib/usbd/usbd_composite.c
View File

@ -226,7 +226,11 @@ static uint8_t USBD_Composite_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqType
int i; int i;
switch (req->bmRequest & USB_REQ_TYPE_MASK) { switch (req->bmRequest & USB_REQ_TYPE_MASK) {
case USB_REQ_TYPE_CLASS : case USB_REQ_TYPE_CLASS :
return USBD_Classes[req->wIndex]->Setup(pdev, req); if (req->wIndex < NUM_INTERFACES)
return USBD_Classes[req->wIndex]->Setup(pdev, req);
else
return USBD_FAIL;
case USB_REQ_TYPE_STANDARD: case USB_REQ_TYPE_STANDARD:
switch (req->bRequest) { switch (req->bRequest) {
@ -242,7 +246,10 @@ static uint8_t USBD_Composite_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqType
case USB_REQ_GET_INTERFACE : case USB_REQ_GET_INTERFACE :
case USB_REQ_SET_INTERFACE : case USB_REQ_SET_INTERFACE :
return USBD_Classes[req->wIndex]->Setup(pdev, req); if (req->wIndex < NUM_INTERFACES)
return USBD_Classes[req->wIndex]->Setup(pdev, req);
else
return USBD_FAIL;
} }
} }
return USBD_OK; return USBD_OK;