[vlc-commits] commit: Fixed segfault with corrupted AVI ODML index. (Laurent Aimar )

[git at videolan.org]

vlc/vlc-1.0 | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue Feb 23 22:36:52 2010 +0100| [f063a0e51940d11c2c5940c60cd3ff07fc4d38b6] | committer: Rémi Denis-Courmont 

Fixed segfault with corrupted AVI ODML  index.

(cherry picked from commit 07f608d11eade6b1bbf5b7a41176e6fb90f1d7e9)
Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.0.git/?a=commit;h=f063a0e51940d11c2c5940c60cd3ff07fc4d38b6
---

 modules/demux/avi/avi.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index e5cd843..acf6760 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -2344,7 +2344,8 @@ static void AVI_IndexLoad_indx( demux_t *p_demux )
                 {
                     break;
                 }
-                __Parse_indx( p_demux, i_stream, &ck_sub.indx );
+                if( ck_sub.indx.i_indextype == AVI_INDEX_OF_CHUNKS )
+                    __Parse_indx( p_demux, i_stream, &ck_sub.indx );
                 AVI_ChunkFree( p_demux->s, &ck_sub );
             }
         }