Merge pull request adafruit#9653 from eric321/mp3-partial-frame-fix

jepler · web-flow · commit 726639be417d · 2024-09-23T20:39:43.000-05:00
Fix infinite loop when there's a partial frame at the end of the file.
diff --git a/shared-module/audiomp3/MP3Decoder.c b/shared-module/audiomp3/MP3Decoder.c
@@ -482,7 +482,7 @@ audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t *
         if (DO_DEBUG) {
             mp_printf(&mp_plat_print, "%s:%d err=%d\n", __FILE__, __LINE__, err);
         }
-        if (err != ERR_MP3_INDATA_UNDERFLOW && err != ERR_MP3_MAINDATA_UNDERFLOW) {
+        if (self->eof || (err != ERR_MP3_INDATA_UNDERFLOW && err != ERR_MP3_MAINDATA_UNDERFLOW)) {
             memset(buffer, 0, self->frame_buffer_size);
             *buffer_length = 0;
             self->eof = true;

Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t *`
`482`	`482`	`if (DO_DEBUG) {`
`483`	`483`	`mp_printf(&mp_plat_print, "%s:%d err=%d\n", __FILE__, __LINE__, err);`
`484`	`484`	`}`
`485`		`- if (err != ERR_MP3_INDATA_UNDERFLOW && err != ERR_MP3_MAINDATA_UNDERFLOW) {`
	`485`	`+ if (self->eof \|\| (err != ERR_MP3_INDATA_UNDERFLOW && err != ERR_MP3_MAINDATA_UNDERFLOW)) {`
`486`	`486`	`memset(buffer, 0, self->frame_buffer_size);`
`487`	`487`	`*buffer_length = 0;`
`488`	`488`	`self->eof = true;`