virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

perform height sanity check in mmvideo decoder

Browse Source 
Fixes issue2495
Original patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26300 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Daniel Kang
2011-01-10 12:23:03 +00:00
committed by Peter Ross
parent 091bc6ca8c
commit 94e58e5770
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mmvideo.c
View File

@@ -90,6 +90,9 @@ static void mm_decode_intra(MmContext * s, int half_horiz, int half_vert, const
while(i<buf_size) { while(i<buf_size) {
int run_length, color; int run_length, color;
if (y >= s->avctx->height)
return;
if (buf[i] & 0x80) { if (buf[i] & 0x80) {
run_length = 1; run_length = 1;
color = buf[i]; color = buf[i];
@@ -138,6 +141,9 @@ static void mm_decode_inter(MmContext * s, int half_horiz, int half_vert, const
continue; continue;
} }
if (y + half_vert >= s->avctx->height)
return;
for(i=0; i<length; i++) { for(i=0; i<length; i++) {
for(j=0; j<8; j++) { for(j=0; j<8; j++) {
int replace = (buf[r+i] >> (7-j)) & 1; int replace = (buf[r+i] >> (7-j)) & 1;