This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/5.1 in repository ffmpeg.
commit 9119456f65fa38c83c53dfd57f199d5724be30a6 Author: Weidong Wang <[email protected]> AuthorDate: Sat Mar 14 13:18:41 2026 -0500 Commit: Michael Niedermayer <[email protected]> CommitDate: Tue May 5 15:21:13 2026 +0200 avformat/rsd: reject short ADPCM_THP extradata reads Use ffio_read_size() to enforce exact-length reads of the per-channel ADPCM_THP coefficient tables. Previously the return value of avio_read() was unchecked, silently accepting truncated extradata. (cherry picked from commit 06d19d000d8e659e09490bfbcceaa6bb23fb2edb) Signed-off-by: Michael Niedermayer <[email protected]> --- libavformat/rsd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/rsd.c b/libavformat/rsd.c index 33aa0e2c0d..d5e4336333 100644 --- a/libavformat/rsd.c +++ b/libavformat/rsd.c @@ -22,6 +22,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" #include "avio.h" +#include "avio_internal.h" #include "demux.h" #include "internal.h" @@ -131,9 +132,9 @@ static int rsd_read_header(AVFormatContext *s) return ret; for (i = 0; i < par->ch_layout.nb_channels; i++) { - if (avio_feof(pb)) - return AVERROR_EOF; - avio_read(s->pb, st->codecpar->extradata + 32 * i, 32); + ret = ffio_read_size(s->pb, st->codecpar->extradata + 32 * i, 32); + if (ret < 0) + return ret; avio_skip(s->pb, 8); } break; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
