diff options
author | Fabien Poussin <fabien.poussin@gmail.com> | 2019-10-03 11:06:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-03 11:06:06 +0200 |
commit | 75027a647490d62d875c8012c0eac83a441304a8 (patch) | |
tree | 84b471ed26a93896d012f4a644086ac13426bdc2 /os/hal/src/usbh/hal_usbh_desciter.c | |
parent | 967c2f32649272cbb2fd36e7f062d978193956a8 (diff) | |
parent | 77021bb6466f731a572985cebe65d139c212d88d (diff) | |
download | ChibiOS-Contrib-75027a647490d62d875c8012c0eac83a441304a8.tar.gz ChibiOS-Contrib-75027a647490d62d875c8012c0eac83a441304a8.tar.bz2 ChibiOS-Contrib-75027a647490d62d875c8012c0eac83a441304a8.zip |
Merge pull request #199 from dismirlian/usbh
USBH: improvements
Diffstat (limited to 'os/hal/src/usbh/hal_usbh_desciter.c')
-rw-r--r-- | os/hal/src/usbh/hal_usbh_desciter.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/os/hal/src/usbh/hal_usbh_desciter.c b/os/hal/src/usbh/hal_usbh_desciter.c index cfce62b..0ccf4e4 100644 --- a/os/hal/src/usbh/hal_usbh_desciter.c +++ b/os/hal/src/usbh/hal_usbh_desciter.c @@ -25,7 +25,7 @@ void cfg_iter_init(generic_iterator_t *icfg, const uint8_t *buff, uint16_t rem) { icfg->valid = 0; - if ((buff[0] < 2) || (rem < 2) || (rem < buff[0]) + if ((rem < 2) || (buff[0] < 2) || (rem < buff[0]) || (buff[0] < USBH_DT_CONFIG_SIZE) || (buff[1] != USBH_DT_CONFIG)) return; @@ -45,14 +45,14 @@ void if_iter_next(if_iterator_t *iif) { iif->valid = 0; - if ((curr[0] < 2) || (rem < 2) || (rem < curr[0])) + if ((rem < 2) || (curr[0] < 2) || (rem < curr[0])) return; for (;;) { rem -= curr[0]; curr += curr[0]; - if ((curr[0] < 2) || (rem < 2) || (rem < curr[0])) + if ((rem < 2) || (curr[0] < 2) || (rem < curr[0])) return; if (curr[1] == USBH_DT_INTERFACE_ASSOCIATION) { @@ -92,14 +92,14 @@ void ep_iter_next(generic_iterator_t *iep) { iep->valid = 0; - if ((curr[0] < 2) || (rem < 2) || (rem < curr[0])) + if ((rem < 2) || (curr[0] < 2) || (rem < curr[0])) return; for (;;) { rem -= curr[0]; curr += curr[0]; - if ((curr[0] < 2) || (rem < 2) || (rem < curr[0])) + if ((rem < 2) || (curr[0] < 2) || (rem < curr[0])) return; if ((curr[1] == USBH_DT_INTERFACE_ASSOCIATION) @@ -131,13 +131,13 @@ void cs_iter_next(generic_iterator_t *ics) { ics->valid = 0; - if ((curr[0] < 2) || (rem < 2) || (rem < curr[0])) + if ((rem < 2) || (curr[0] < 2) || (rem < curr[0])) return; rem -= curr[0]; curr += curr[0]; - if ((curr[0] < 2) || (rem < 2) || (rem < curr[0])) + if ((rem < 2) || (curr[0] < 2) || (rem < curr[0])) return; if ((curr[1] == USBH_DT_INTERFACE_ASSOCIATION) |