har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oggparsevorbis: check channels

Browse Source 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-17 20:51:07 +01:00
parent 2f7465b5bf
commit 1d29624c73
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/oggparsevorbis.c
View File

@ -230,6 +230,7 @@ vorbis_header (AVFormatContext * s, int idx)
const uint8_t *p = os->buf + os->pstart + 7; /* skip "\001vorbis" tag */ const uint8_t *p = os->buf + os->pstart + 7; /* skip "\001vorbis" tag */
unsigned blocksize, bs0, bs1; unsigned blocksize, bs0, bs1;
int srate; int srate;
int channels;
if (os->psize != 30) if (os->psize != 30)
return -1; return -1;
@ -237,7 +238,12 @@ vorbis_header (AVFormatContext * s, int idx)
if (bytestream_get_le32(&p) != 0) /* vorbis_version */ if (bytestream_get_le32(&p) != 0) /* vorbis_version */
return -1; return -1;
st->codec->channels = bytestream_get_byte(&p); channels= bytestream_get_byte(&p);
if (st->codec->channels && channels != st->codec->channels) {
av_log(s, AV_LOG_ERROR, "Channel change is not supported\n");
return AVERROR_PATCHWELCOME;
}
st->codec->channels = channels;
srate = bytestream_get_le32(&p); srate = bytestream_get_le32(&p);
p += 4; // skip maximum bitrate p += 4; // skip maximum bitrate
st->codec->bit_rate = bytestream_get_le32(&p); // nominal bitrate st->codec->bit_rate = bytestream_get_le32(&p); // nominal bitrate