TeamHepta/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-08 17:04:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ensure Android hidapi does not drop the report byte (#15527)

Browse Source 
(cherry picked from commit f8c364ae74)
This commit is contained in:
Rachel Blackman
2026-05-06 15:14:09 -07:00
committed by Sam Lantinga
parent 1ee51f2d88
commit e1513e2d3c
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/hidapi/android/hid.cpp
View File

@@ -716,9 +716,27 @@ public:
}
}
size_t uBytesToCopy = m_reportResponse.size() > nDataLen ? nDataLen : m_reportResponse.size();
SDL_memcpy( pData, m_reportResponse.data(), uBytesToCopy );
m_reportResponse.clear();
size_t uBytesToCopy = 0;
if ( m_reportResponse.size() > 0 )
{
// Make sure we preserve the report value if it isn't already in the report.
bool bHasReportAlready = ( *pData == *m_reportResponse.data() );
// Make sure we only copy as much as will fit, deducting one byte for the report if we need to leave it intact.
size_t nSafeDataLen = nDataLen - ( bHasReportAlready ? 0 : 1 );
uBytesToCopy = m_reportResponse.size() < nSafeDataLen ? m_reportResponse.size() : nSafeDataLen;
SDL_memcpy( pData + ( bHasReportAlready ? 0 : 1 ), m_reportResponse.data(), uBytesToCopy );
m_reportResponse.clear();
if ( !bHasReportAlready )
{
// Add the report byte back on to return the real length.
uBytesToCopy++;
}
}
LOGV( "=== Got %zu bytes", uBytesToCopy );
return (int)uBytesToCopy;