[MPlayer-cvslog] r20161 - trunk/libmpdemux/demux_mkv.c

[reimar]

Author: reimar
Date: Wed Oct 11 17:57:51 2006
New Revision: 20161

Modified:
   trunk/libmpdemux/demux_mkv.c

Log:
More possible memleaks.


Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	(original)
+++ trunk/libmpdemux/demux_mkv.c	Wed Oct 11 17:57:51 2006
@@ -3538,10 +3538,14 @@
 
                 case MATROSKA_ID_BLOCK:
                   block_length = ebml_read_length (s, &tmp);
+                  free(block);
                   block = malloc (block_length);
                   demuxer->filepos = stream_tell (s);
                   if (stream_read (s,block,block_length) != (int) block_length)
+                  {
+                    free(block);
                     return 0;
+                  }
                   l = tmp + block_length;
                   break;
 
@@ -3609,7 +3613,10 @@
                     block = malloc (block_length);
                     demuxer->filepos = stream_tell (s);
                     if (stream_read (s,block,block_length) != (int) block_length)
+                    {
+                      free(block);
                       return 0;
+                    }
                     l = tmp + block_length;
                     res = handle_block (demuxer, block, block_length,
                                         block_duration, block_bref, block_fref, 1);