OSDN Git Service

mjpegdec: reset h/v_count, fix assertion failure.
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Nov 2012 20:07:39 +0000 (21:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Nov 2012 05:00:44 +0000 (06:00 +0100)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegdec.c

index ae0e504..915347d 100644 (file)
@@ -263,6 +263,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
     s->nb_components = nb_components;
     s->h_max         = 1;
     s->v_max         = 1;
+    memset(s->h_count, 0, sizeof(s->h_count));
+    memset(s->v_count, 0, sizeof(s->v_count));
     for (i = 0; i < nb_components; i++) {
         /* component id */
         s->component_id[i] = get_bits(&s->gb, 8) - 1;