andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2987 from hathach/fix-2923-alt

Browse Source 
make sure TOTAL_DRIVER_COUNT is not overflow 8-bit
This commit is contained in:
Ha Thach
2025-07-10 18:50:42 +07:00
committed by GitHub
parent 546e8413b5 ea38115d6c
commit 40dc1dd436
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/device/usbd.c
View File

@@ -329,26 +329,24 @@ enum { BUILTIN_DRIVER_COUNT = TU_ARRAY_SIZE(_usbd_driver) };
tu_static usbd_class_driver_t const * _app_driver = NULL; tu_static usbd_class_driver_t const * _app_driver = NULL;
tu_static uint8_t _app_driver_count = 0; tu_static uint8_t _app_driver_count = 0;
#define TOTAL_DRIVER_COUNT (_app_driver_count + BUILTIN_DRIVER_COUNT) #define TOTAL_DRIVER_COUNT ((uint8_t) (_app_driver_count + BUILTIN_DRIVER_COUNT))
// virtually joins built-in and application drivers together. // virtually joins built-in and application drivers together.
// Application is positioned first to allow overwriting built-in ones. // Application is positioned first to allow overwriting built-in ones.
TU_ATTR_ALWAYS_INLINE static inline usbd_class_driver_t const * get_driver(uint8_t drvid) { TU_ATTR_ALWAYS_INLINE static inline usbd_class_driver_t const * get_driver(uint8_t drvid) {
usbd_class_driver_t const * driver = NULL; usbd_class_driver_t const *driver = NULL;
if ( drvid < _app_driver_count ) { if (drvid < _app_driver_count) {
// Application drivers // Application drivers
driver = &_app_driver[drvid]; driver = &_app_driver[drvid];
} else if ( drvid < TOTAL_DRIVER_COUNT && BUILTIN_DRIVER_COUNT > 0 ){ } else if (drvid < TOTAL_DRIVER_COUNT && BUILTIN_DRIVER_COUNT > 0) {
driver = &_usbd_driver[drvid - _app_driver_count]; driver = &_usbd_driver[drvid - _app_driver_count];
} }
return driver; return driver;
} }
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// DCD Event // DCD Event
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
enum { RHPORT_INVALID = 0xFFu }; enum { RHPORT_INVALID = 0xFFu };
tu_static uint8_t _usbd_rhport = RHPORT_INVALID; tu_static uint8_t _usbd_rhport = RHPORT_INVALID;
@@ -520,6 +518,7 @@ bool tud_rhport_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
// Get application driver if available // Get application driver if available
if (usbd_app_driver_get_cb) { if (usbd_app_driver_get_cb) {
_app_driver = usbd_app_driver_get_cb(&_app_driver_count); _app_driver = usbd_app_driver_get_cb(&_app_driver_count);
TU_ASSERT(_app_driver_count + BUILTIN_DRIVER_COUNT <= UINT8_MAX);
} }
// Init class drivers // Init class drivers