matroskadec: Fix a bug where a pointer was cached to an array that might later move...
authorChris Evans <cevans@chromium.org>
Thu, 5 Jan 2012 20:19:30 +0000 (21:19 +0100)
committerReinhard Tartler <siretart@tauware.de>
Thu, 5 Jan 2012 20:21:57 +0000 (21:21 +0100)
Fixes bug #190
Chromium bug #100492
related to CVE-2011-3893

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
libavformat/matroskadec.c

index 2684d6e..e5fbd43 100644 (file)
@@ -1188,7 +1188,6 @@ static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, int idx
 static void matroska_execute_seekhead(MatroskaDemuxContext *matroska)
 {
     EbmlList *seekhead_list = &matroska->seekhead;
-    MatroskaSeekhead *seekhead = seekhead_list->elem;
     int64_t before_pos = avio_tell(matroska->ctx->pb);
     int i;
 
@@ -1198,6 +1197,7 @@ static void matroska_execute_seekhead(MatroskaDemuxContext *matroska)
         return;
 
     for (i = 0; i < seekhead_list->nb_elem; i++) {
+        MatroskaSeekhead *seekhead = seekhead_list->elem;
         if (seekhead[i].pos <= before_pos)
             continue;