From 3af9d8269ea2878fb7960ab5ed52f4a75c73e6ec Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 10 Dec 2013 18:34:52 +0100 Subject: [PATCH] avcodec/g2meet: check the return code of ff_set_dimensions() 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 --- libavcodec/g2meet.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 8f8e88047a..9b70b61ef8 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -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, -- 2.11.0