[FFmpeg-cvslog] r23330 - trunk/libavformat/matroskadec.c

[aurel]

Author: aurel
Date: Wed May 26 00:55:12 2010
New Revision: 23330

Log:
matroskadec: avoid potential crash after r23169

Modified:
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	Wed May 26 00:53:22 2010	(r23329)
+++ trunk/libavformat/matroskadec.c	Wed May 26 00:55:12 2010	(r23330)
@@ -1793,7 +1793,7 @@ static int matroska_parse_cluster(Matros
     blocks_list = &cluster.blocks;
     blocks = blocks_list->elem;
     for (i=0; i<blocks_list->nb_elem; i++)
-        if (blocks[i].bin.size > 0) {
+        if (blocks[i].bin.size > 0 && blocks[i].bin.data) {
             int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1;
             res=matroska_parse_block(matroska,
                                      blocks[i].bin.data, blocks[i].bin.size,