[MPlayer-cvslog] r23313 - trunk/libmpdemux/demux_asf.c

uau subversion at mplayerhq.hu
Mon May 14 03:23:54 CEST 2007


Author: uau
Date: Mon May 14 03:23:54 2007
New Revision: 23313

Log:
Fix double free() in demux_asf.c

If demux_open_asf() fails it frees the demuxer->priv field before
returning. Then demuxer.c calls demux_close_asf() which frees the field
again. Fix by removing the free() in demux_open_asf().


Modified:
   trunk/libmpdemux/demux_asf.c

Modified: trunk/libmpdemux/demux_asf.c
==============================================================================
--- trunk/libmpdemux/demux_asf.c	(original)
+++ trunk/libmpdemux/demux_asf.c	Mon May 14 03:23:54 2007
@@ -701,10 +701,8 @@ static demuxer_t* demux_open_asf(demuxer
     //---- ASF header:
     if(!asf) return NULL;
     init_priv(asf);
-    if (!read_asf_header(demuxer,asf)) {
-        free(asf);
+    if (!read_asf_header(demuxer,asf))
         return NULL;
-    }
     stream_reset(demuxer->stream);
     stream_seek(demuxer->stream,demuxer->movi_start);
 //    demuxer->idx_pos=0;



More information about the MPlayer-cvslog mailing list