From: Michael Niedermayer <michael@niedermayer.cc>
Date: Tue, 1 Sep 2015 00:45:10 +0000 (+0200)
Subject: avcodec/mpeg12dec: Set dimensions in mpeg1_decode_sequence() only in absence of errors
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b54e03c9dc2a05324c08b503bfe7535c49c0f281;hp=a047ccbb9fad2c33db7ebc40b95e34ea6ee89c21;p=ffmpeg

avcodec/mpeg12dec: Set dimensions in mpeg1_decode_sequence() only in absence of errors

Fixes assertion failure
Fixes: 56dcafde14a8397161bb61a16c511179/signal_sigabrt_7ffff6ac8cc9_686_cov_1897408623_microsoft_new_way_to_shove_mpeg2_in_asf.dvr_ms

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 5f42e95f704..53ad186875b 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2179,8 +2179,6 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
     if (check_marker(&s->gb, "in sequence header") == 0) {
         return AVERROR_INVALIDDATA;
     }
-    s->width  = width;
-    s->height = height;
 
     s->avctx->rc_buffer_size = get_bits(&s->gb, 10) * 1024 * 16;
     skip_bits(&s->gb, 1);
@@ -2212,6 +2210,9 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
         return AVERROR_INVALIDDATA;
     }
 
+    s->width  = width;
+    s->height = height;
+
     /* We set MPEG-2 parameters so that it emulates MPEG-1. */
     s->progressive_sequence = 1;
     s->progressive_frame    = 1;