commit 1883249be396b8dd6b67f8750749bef61dd24525
author Michael Niedermayer <michaelni@gmx.at> Sat Sep 17 19:40:25 2011 +0200
committer Michael Niedermayer <michaelni@gmx.at> Sun Nov 06 18:32:40 2011 +0100
tree f1bc3db876d3c1c4dc8ca8fea264c45faa408c38
parent 648dc68098a2d484ebf7b4c48baa3d08e34adef0

rv34: check for size mismatch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 35f38b3ab9d755aede5bce8abbe1cb9c07027f8a)
(cherry picked from commit ed9e561490d70e317659f9e406c7920242e509eb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/rv34.c

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index da20dbb..c4e3621 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1276,6 +1276,10 @@
             av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n");
             return AVERROR_INVALIDDATA;
         }
+        if (s->width != r->si.width || s->height != r->si.height) {
+            av_log(s->avctx, AV_LOG_ERROR, "Size mismatch\n");
+            return AVERROR_INVALIDDATA;
+        }
     }
 
     r->si.end = end;