diff options
| author | Chris Cunningham <chcunningham@chromium.org> | 2016-11-22 13:54:50 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-15 04:36:28 +0100 |
| commit | ab87df9a47cd31bfcae9acd84c04705a149dfc14 (patch) | |
| tree | 65039e3982c7ce1d27c621067924d14392536e48 /libavformat/mp3dec.c | |
| parent | ed412d285078c167a3a5326bcb16b2169b488943 (diff) | |
| download | ffmpeg-ab87df9a47cd31bfcae9acd84c04705a149dfc14.tar.gz | |
avformat/mp3dec: fix msan warning when verifying mpa header
MPEG Audio frame header must be 4 bytes. If we fail to read
4 bytes bail early to avoid Use-of-uninitialized-value msan error.
Reference https://crbug.com/666874.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mp3dec.c')
| -rw-r--r-- | libavformat/mp3dec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 56c7f8caee..099ca57d24 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -457,7 +457,8 @@ static int check(AVIOContext *pb, int64_t pos, uint32_t *ret_header) return CHECK_SEEK_FAILED; ret = avio_read(pb, &header_buf[0], 4); - if (ret < 0) + /* We should always find four bytes for a valid mpa header. */ + if (ret < 4) return CHECK_SEEK_FAILED; header = AV_RB32(&header_buf[0]); |