virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size.

Browse Source 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
This commit is contained in:
Alex Converse 2012-03-01 14:07:22 -08:00
parent 1697c29d75
commit 2f6528537f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/rv10.c
View File

@ -642,8 +642,12 @@ static int rv10_decode_frame(AVCodecContext *avctx,
if(!avctx->slice_count){ if(!avctx->slice_count){
slice_count = (*buf++) + 1; slice_count = (*buf++) + 1;
buf_size--;
slices_hdr = buf + 4; slices_hdr = buf + 4;
buf += 8 * slice_count; buf += 8 * slice_count;
buf_size -= 8 * slice_count;
if (buf_size <= 0)
return AVERROR_INVALIDDATA;
}else }else
slice_count = avctx->slice_count; slice_count = avctx->slice_count;
@ -689,7 +693,7 @@ static int rv10_decode_frame(AVCodecContext *avctx,
s->current_picture_ptr= NULL; //so we can detect if frame_end wasnt called (find some nicer solution...) s->current_picture_ptr= NULL; //so we can detect if frame_end wasnt called (find some nicer solution...)
} }
return buf_size; return avpkt->size;
} }
AVCodec ff_rv10_decoder = { AVCodec ff_rv10_decoder = {