Skip to content

Fix issue overflow when reading data #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bertmelis merged 5 commits into from
Feb 6, 2026
Merged

Fix issue overflow when reading data #21

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d629ff
Fix issue overflow when reading data
urbytes21 Feb 5, 2026
59720d5
Explicitly stop read when remaining size is zero
urbytes21 Feb 5, 2026
68e1a68
Explicitly stop read when remaining size is zero
urbytes21 Feb 5, 2026
df7f5c4
Fix conflict
urbytes21 Feb 5, 2026
ca296d5
Merge branch 'bertmelis:main' into main
urbytes21 Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/USBHostSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,21 @@ uint8_t USBHostSerial::read() {
std::size_t USBHostSerial::read(uint8_t *dest, std::size_t size) {
std::size_t retVal = 0;
std::size_t pxItemSize = 0;
while (size > pxItemSize) {
void *ret = xRingbufferReceiveUpTo(_rx_buf_handle, &pxItemSize, pdMS_TO_TICKS(1), size - pxItemSize);
if (ret) {
std::memcpy(dest + retVal, ret, pxItemSize);
retVal += pxItemSize;
vRingbufferReturnItem(_rx_buf_handle, ret);
} else {
while (size > retVal) {
std::size_t remaining = size - retVal;
if(remaining == 0){
break;
}

void *ret = xRingbufferReceiveUpTo(_rx_buf_handle, &pxItemSize, pdMS_TO_TICKS(1), remaining);

if(!ret || pxItemSize == 0){
break;
}

std::memcpy(dest + retVal, ret, pxItemSize);
retVal += pxItemSize;
vRingbufferReturnItem(_rx_buf_handle, ret);
}
return retVal;
}
Expand Down