Vergil_Wong/lib_xua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add size range tests. Fix misspelled function name.

Browse Source
This commit is contained in:
mbanth
2021-05-25 11:23:18 +01:00
parent 46cac9afb9
commit b1f3cc0024
3 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib_xua/src/hid/hid_report_descriptor.c
View File

@@ -239,7 +239,6 @@ static unsigned hidGetItemByteLocation( const unsigned char location )
static unsigned hidGetItemSize( const unsigned char header )
{
unsigned bSize = ( header & HID_REPORT_ITEM_HDR_SIZE_MASK ) >> HID_REPORT_ITEM_HDR_SIZE_SHIFT;
assert( bSize <= HID_REPORT_ITEM_MAX_SIZE );
return bSize;
}
@@ -266,7 +265,7 @@ unsigned char* hidGetReportDescriptor( void )
return retVal;
}
void hidPrerpareReportDescriptor( void )
void hidPrepareReportDescriptor( void )
{
unsigned char* ptr = hidReportDescriptor;
for( unsigned idx = 0; idx < sizeof hidReportDescriptorItems / sizeof( USB_HID_Short_Item_t ); ++idx ) {
@@ -283,9 +282,9 @@ unsigned hidSetReportItem( const unsigned byte, const unsigned bit, const unsign
unsigned bTag = hidGetItemTag ( header );
unsigned bType = hidGetItemType( header );
if(( HID_REPORT_ITEM_MAX_SIZE < bSize ) &&
( HID_REPORT_ITEM_USAGE_TAG == bTag ) &&
( HID_REPORT_ITEM_USAGE_TAG == bType )) {
if(( HID_REPORT_ITEM_MAX_SIZE < bSize ) ||
( HID_REPORT_ITEM_USAGE_TAG != bTag ) ||
( HID_REPORT_ITEM_USAGE_TYPE != bType )) {
retVal = HID_STATUS_BAD_HEADER;
} else {
for( unsigned itemIdx = 0; itemIdx < sizeof hidConfigurableItems / sizeof( USB_HID_Short_Item_t ); ++itemIdx ) {

4
lib_xua/src/hid/xua_hid_report_descriptor.h
View File

@@ -75,6 +75,10 @@ void hidPrepareReportDescriptor( void );
/**
* @brief Modify a HID Report descriptor item
*
* @warning This function does not check that the length of the \a data array matches the value of
* the bSize field in the \a header. For safe operation use a \a data array of at least
* \c HID_REPORT_ITEM_MAX_SIZE bytes in length.
*
* Parameters:
*
* @param[in] byte The byte position of the control within the HID Report