aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/diracdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-12-17 17:02:14 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-17 19:00:33 +0100
commit73840bbe4eea1e99807bc6bcc4cbe5188025ff1d (patch)
tree885b5adcf693d544c3153ab687e9566ff8f60bc3 /libavcodec/diracdec.c
parente839db2288447db471af3e4643d1f350265cd1ac (diff)
downloadffmpeg-73840bbe4eea1e99807bc6bcc4cbe5188025ff1d.tar.gz
avcodec/diracdec: Check ff_set_dimensions() for failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/diracdec.c')
-rw-r--r--libavcodec/diracdec.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index f35fe453ee..486c1b3ad7 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -1989,7 +1989,12 @@ static int dirac_decode_data_unit(AVCodecContext *avctx, const uint8_t *buf, int
return ret;
}
- ff_set_dimensions(avctx, dsh->width, dsh->height);
+ ret = ff_set_dimensions(avctx, dsh->width, dsh->height);
+ if (ret < 0) {
+ av_freep(&dsh);
+ return ret;
+ }
+
ff_set_sar(avctx, dsh->sample_aspect_ratio);
avctx->pix_fmt = dsh->pix_fmt;
avctx->color_range = dsh->color_range;