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

faxcompr: Check malloc results and unify return path

Browse Source
This commit is contained in:
Alex Converse 2012-04-12 18:10:57 -07:00
parent 6555acad10
commit 99a335299f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/faxcompr.c
View File

@ -275,12 +275,17 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
{ {
int j; int j;
GetBitContext gb; GetBitContext gb;
int *runs, *ref, *runend; int *runs, *ref = NULL, *runend;
int ret; int ret;
int runsize= avctx->width + 2; int runsize= avctx->width + 2;
int err = 0;
runs = av_malloc(runsize * sizeof(runs[0])); runs = av_malloc(runsize * sizeof(runs[0]));
ref = av_malloc(runsize * sizeof(ref[0])); ref = av_malloc(runsize * sizeof(ref[0]));
if (!runs || ! ref) {
err = AVERROR(ENOMEM);
goto fail;
}
ref[0] = avctx->width; ref[0] = avctx->width;
ref[1] = 0; ref[1] = 0;
ref[2] = 0; ref[2] = 0;
@ -290,9 +295,8 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
if(compr == TIFF_G4){ if(compr == TIFF_G4){
ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref); ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref);
if(ret < 0){ if(ret < 0){
av_free(runs); err = -1;
av_free(ref); goto fail;
return -1;
} }
}else{ }else{
int g3d1 = (compr == TIFF_G3) && !(opts & 1); int g3d1 = (compr == TIFF_G3) && !(opts & 1);
@ -313,7 +317,8 @@ int ff_ccitt_unpack(AVCodecContext *avctx,
} }
dst += stride; dst += stride;
} }
fail:
av_free(runs); av_free(runs);
av_free(ref); av_free(ref);
return 0; return err;
} }