Module: libav Branch: master Commit: 99a335299ff3541f89e6e3be4b9ae84257288fcc
Author: Alex Converse <[email protected]> Committer: Alex Converse <[email protected]> Date: Thu Apr 12 18:10:57 2012 -0700 faxcompr: Check malloc results and unify return path --- libavcodec/faxcompr.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c index a0fa825..077e740 100644 --- a/libavcodec/faxcompr.c +++ b/libavcodec/faxcompr.c @@ -275,12 +275,17 @@ int ff_ccitt_unpack(AVCodecContext *avctx, { int j; GetBitContext gb; - int *runs, *ref, *runend; + int *runs, *ref = NULL, *runend; int ret; int runsize= avctx->width + 2; + int err = 0; runs = av_malloc(runsize * sizeof(runs[0])); ref = av_malloc(runsize * sizeof(ref[0])); + if (!runs || ! ref) { + err = AVERROR(ENOMEM); + goto fail; + } ref[0] = avctx->width; ref[1] = 0; ref[2] = 0; @@ -290,9 +295,8 @@ int ff_ccitt_unpack(AVCodecContext *avctx, if(compr == TIFF_G4){ ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref); if(ret < 0){ - av_free(runs); - av_free(ref); - return -1; + err = -1; + goto fail; } }else{ int g3d1 = (compr == TIFF_G3) && !(opts & 1); @@ -313,7 +317,8 @@ int ff_ccitt_unpack(AVCodecContext *avctx, } dst += stride; } +fail: av_free(runs); av_free(ref); - return 0; + return err; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
