diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-05-25 22:55:12 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-05-25 22:55:12 +0000 |
| commit | 37dd235658bc797667ec842abaed19169a36e6e5 (patch) | |
| tree | 6f36ba3d6dafc1f710f3f84f4ce45c10d26438e5 /libavformat | |
| parent | 344f5c9fb3c1b48622fe632785b999b7610d8a4b (diff) | |
| download | ffmpeg-37dd235658bc797667ec842abaed19169a36e6e5.tar.gz | |
matroskadec: avoid potential crash after r23169
Originally committed as revision 23330 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 3e33d08ab8..33e3d884ed 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1793,7 +1793,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) 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, |