Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-12 14:37:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

mp4/aac decoder might overflow and lock at the end of track - release

Browse Source
This commit is contained in:
Philippe G
2020-12-23 00:55:21 -08:00
parent 9a8991ebf2
commit 1c730905ec
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/squeezelite/helix-aac.c
View File

@@ -431,13 +431,19 @@ static decode_state helixaac_decode(void) {
} }
// we always have at least WRAPBUF_LEN unless it's the end of a stream // we always have at least WRAPBUF_LEN unless it's the end of a stream
/* There is a bug in helixaac where it overflows its buffer when not having
* samples and enters an infinite loop so we can't do here the proper test
* if (bytes_wrap < WRAPBUF_LEN && bytes_wrap != bytes_total)
* but instead we'll zero the wrap buf and provide a safe overflow space
* for the decoder
*/
if (bytes_wrap < WRAPBUF_LEN) { if (bytes_wrap < WRAPBUF_LEN) {
// build a linear buffer if we are crossing the end of streambuf // build a linear buffer if we are crossing the end of streambuf
memcpy(a->wrap_buf, streambuf->readp, bytes_wrap); memcpy(a->wrap_buf, streambuf->readp, bytes_wrap);
memcpy(a->wrap_buf + bytes_wrap, streambuf->buf, min(WRAPBUF_LEN, bytes_total) - bytes_wrap); memcpy(a->wrap_buf + bytes_wrap, streambuf->buf, min(WRAPBUF_LEN, bytes_total) - bytes_wrap);
sptr = a->wrap_buf; sptr = a->wrap_buf;
bytes = bytes_wrap = min(WRAPBUF_LEN, bytes_total); if (bytes_total < WRAPBUF_LEN) memset(a->wrap_buf + bytes_total, 0, WRAPBUF_LEN - bytes_total);
else bytes = bytes_wrap = min(WRAPBUF_LEN, bytes_total);
} else { } else {
sptr = streambuf->readp; sptr = streambuf->readp;
bytes = bytes_wrap; bytes = bytes_wrap;