avcodec/g2meet: check the return code of ff_set_dimensions()
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Dec 2013 17:34:52 +0000 (18:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Dec 2013 17:34:52 +0000 (18:34 +0100)
This is currently redundant as the checks before it are tighter than
the checks in ff_set_dimensions() but its more robust not to depend
on that.

Fixes CID1135739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/g2meet.c

index 8f8e880..9b70b61 100644 (file)
@@ -697,8 +697,11 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
                 ret = AVERROR_INVALIDDATA;
                 goto header_fail;
             }
-            if (c->width != avctx->width || c->height != avctx->height)
-                ff_set_dimensions(avctx, c->width, c->height);
+            if (c->width != avctx->width || c->height != avctx->height) {
+                ret = ff_set_dimensions(avctx, c->width, c->height);
+                if (ret < 0)
+                    goto header_fail;
+            }
             c->compression = bytestream2_get_be32(&bc);
             if (c->compression != 2 && c->compression != 3) {
                 av_log(avctx, AV_LOG_ERROR,