xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-28 14:01:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Close gaping sechole. That is, a series of run=0 allows arbitrary data to

Browse Source 
be written over the end of the runs array.

Originally committed as revision 16334 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-12-26 16:29:01 +00:00
parent d02ab57a5f
commit 1d7985072c
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/faxcompr.c
View File

@ -123,7 +123,7 @@ av_cold void ff_ccitt_unpack_init()
static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb, static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
int pix_left, int *runs) int pix_left, int *runs, const int *runend)
{ {
int mode = 0, run = 0; int mode = 0, run = 0;
unsigned int t; unsigned int t;
@ -133,6 +133,10 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
if(t < 64){ if(t < 64){
pix_left -= run; pix_left -= run;
*runs++ = run; *runs++ = run;
if(runs >= runend){
av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
return -1;
}
if(pix_left <= 0){ if(pix_left <= 0){
if(!pix_left) if(!pix_left)
break; break;
@ -152,12 +156,14 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
} }
static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb, static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
int pix_left, int *runs, const int *ref) int pix_left, int *runs, const int *runend, const int *ref)
{ {
int mode = 0, offs = 0, run = 0, saved_run = 0, t; int mode = 0, offs = 0, run = 0, saved_run = 0, t;
int run_off = *ref++; int run_off = *ref++;
int *run_start = runs; int *run_start = runs;
runend--; // for the last written 0
while(pix_left > 0){ while(pix_left > 0){
int cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1); int cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1);
if(cmode == -1){ if(cmode == -1){
@ -195,6 +201,10 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
break; break;
} }
*runs++ = run + saved_run; *runs++ = run + saved_run;
if(runs >= runend){
av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
return -1;
}
saved_run = 0; saved_run = 0;
pix_left -= run; pix_left -= run;
if(pix_left < 0){ if(pix_left < 0){
@ -220,6 +230,10 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
} }
offs += run; offs += run;
*runs++ = run + saved_run; *runs++ = run + saved_run;
if(runs >= runend){
av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
return -1;
}
saved_run = 0; saved_run = 0;
mode = !mode; mode = !mode;
} }
@ -264,7 +278,7 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
{ {
int j; int j;
GetBitContext gb; GetBitContext gb;
int *runs, *ref; int *runs, *ref, *runend;
int ret; int ret;
runs = av_malloc((avctx->width + 2) * sizeof(runs[0])); runs = av_malloc((avctx->width + 2) * sizeof(runs[0]));
@ -274,8 +288,9 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
ref[2] = 0; ref[2] = 0;
init_get_bits(&gb, src, srcsize*8); init_get_bits(&gb, src, srcsize*8);
for(j = 0; j < height; j++){ for(j = 0; j < height; j++){
runend = runs + avctx->width + 2;
if(compr == TIFF_G4){ if(compr == TIFF_G4){
ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, ref); ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref);
if(ret < 0){ if(ret < 0){
av_free(runs); av_free(runs);
av_free(ref); av_free(ref);
@ -285,9 +300,9 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
if(find_group3_syncmarker(&gb, srcsize*8) < 0) if(find_group3_syncmarker(&gb, srcsize*8) < 0)
break; break;
if(compr==TIFF_CCITT_RLE || get_bits1(&gb)) if(compr==TIFF_CCITT_RLE || get_bits1(&gb))
ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs); ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend);
else else
ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, ref); ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref);
} }
if(ret < 0){ if(ret < 0){
put_line(dst, stride, avctx->width, ref); put_line(dst, stride, avctx->width, ref);