[Mplayer-cvslog] CVS: main/libmpdemux demux_mkv.c,1.17,1.18

[Moritz Bunkus CVS]

CVS change done by Moritz Bunkus CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv26959

Modified Files:
	demux_mkv.c 
Log Message:
Do not dereference NULL if no track could be found for a block.

Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- demux_mkv.c	10 Jun 2004 11:16:44 -0000	1.17
+++ demux_mkv.c	28 Jun 2004 16:43:01 -0000	1.18
@@ -2704,8 +2704,15 @@
   clear_subtitles(demuxer, tc, 0);
 
   for (i=0; i<mkv_d->num_tracks; i++)
-    if (mkv_d->tracks[i]->tnum == num)
+    if (mkv_d->tracks[i]->tnum == num) {
       track = mkv_d->tracks[i];
+      break;
+    }
+  if (track == NULL)
+    {
+      free(lace_size);
+      return 1;
+    }
   if (num == demuxer->audio->id)
     {
       ds = demuxer->audio;