X-Git-Url: https://git.libav.org/?p=libav.git;a=blobdiff_plain;f=libavcodec%2Fh264.c;h=7d49d4877d7726811451d691210732ad853fc642;hp=c0dfa3d63837712607a9c2a875d04a505eacaf38;hb=9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf;hpb=bfd26b7ce6efea594f2b99441d900419df3af638

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index c0dfa3d638..7d49d4877d 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4495,6 +4495,12 @@ static int execute_decode_slices(H264Context *h, int context_count)
     H264Context *hx;
     int i;
 
+    if (h->mb_y >= h->mb_height) {
+        av_log(h->avctx, AV_LOG_ERROR,
+               "Input contains more MB rows than the frame height.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     if (h->avctx->hwaccel)
         return 0;
     if (context_count == 1) {