Skip to content

mp3decoder inbuf update fix #11219

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
tannewt merged 3 commits into from
Aug 21, 2026
Merged

mp3decoder inbuf update fix #11219

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8fde38
mp3decoder inbuf update fix
FoamyGuy Aug 20, 2026
64fc089
remove extra function layer
FoamyGuy Aug 20, 2026
8babf99
re-allow background tasks on other exit paths
FoamyGuy Aug 20, 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
16 changes: 13 additions & 3 deletions shared-module/audiomp3/MP3Decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,13 @@ static void stream_set_blocking(audiomp3_mp3file_obj_t *self, bool block_ok) {
* Sets self->eof if any read of the file returns 0 bytes
*/
static bool mp3file_update_inbuf_always(audiomp3_mp3file_obj_t *self, bool block_ok) {
// Every return from this function must be preceded by background_callback_allow();
background_callback_prevent();

if (self->eof || INPUT_BUFFER_SPACE(self->inbuf) == 0) {
return INPUT_BUFFER_AVAILABLE(self->inbuf) > 0;
bool result = INPUT_BUFFER_AVAILABLE(self->inbuf) > 0;
background_callback_allow();
return result;
}

stream_set_blocking(self, block_ok);
Expand All @@ -135,7 +140,8 @@ static bool mp3file_update_inbuf_always(audiomp3_mp3file_obj_t *self, bool block
self->inbuf.read_off = 0;
}

for (size_t to_read; !self->eof && (to_read = INPUT_BUFFER_SPACE(self->inbuf)) > 0;) {
for (size_t to_read; !self->eof && INPUT_BUFFER_SPACE(self->inbuf) > 0 &&
(to_read = (size_t)INPUT_BUFFER_SPACE(self->inbuf)) > 0;) {
uint8_t *write_ptr = self->inbuf.buf + self->inbuf.write_off;
ssize_t n_read = stream_read(self->stream, write_ptr, to_read);

Expand All @@ -145,6 +151,7 @@ static bool mp3file_update_inbuf_always(audiomp3_mp3file_obj_t *self, bool block
break;
}
self->eof = true;
background_callback_allow();
mp_raise_OSError(errcode);
}

Expand All @@ -160,7 +167,10 @@ static bool mp3file_update_inbuf_always(audiomp3_mp3file_obj_t *self, bool block
}

// Return true iff there are at least some useful bytes in the buffer
return INPUT_BUFFER_AVAILABLE(self->inbuf) > 0;
bool result = INPUT_BUFFER_AVAILABLE(self->inbuf) > 0;

background_callback_allow();
return result;
}

/** Update the inbuf from a background callback.
Expand Down
Loading