generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

theora: check that pix fmt is valid, fix null ptr deref

Browse Source 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-12 18:04:12 +01:00
parent 9eef41b848
commit d1493d2ce5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/vp3.c
View File

@ -2175,6 +2175,10 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
{ {
skip_bits(gb, 5); /* keyframe frequency force */ skip_bits(gb, 5); /* keyframe frequency force */
avctx->pix_fmt = theora_pix_fmts[get_bits(gb, 2)]; avctx->pix_fmt = theora_pix_fmts[get_bits(gb, 2)];
if (avctx->pix_fmt == AV_PIX_FMT_NONE) {
av_log(avctx, AV_LOG_ERROR, "Invalid pixel format\n");
return AVERROR_INVALIDDATA;
}
skip_bits(gb, 3); /* reserved */ skip_bits(gb, 3); /* reserved */
} }
@ -2349,7 +2353,8 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
switch(ptype) switch(ptype)
{ {
case 0x80: case 0x80:
theora_decode_header(avctx, &gb); if (theora_decode_header(avctx, &gb) < 0)
return -1;
break; break;
case 0x81: case 0x81:
// FIXME: is this needed? it breaks sometimes // FIXME: is this needed? it breaks sometimes