[MPlayer-cvslog] CVS: main/libmpdemux demuxer.c,1.186,1.187

[Richard Felker CVS]

CVS change done by Richard Felker CVS

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

Modified Files:
	demuxer.c 
Log Message:
revert one line of version 1.182 patch (caused use of already-freed
memory and multiple double-free errors). i am fairly confident that
all the relevant memory is now freed once and exactly once, but it's
better than corrupting the heap in any case.
100l to reimar :)


Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- demuxer.c	28 Apr 2005 14:43:19 -0000	1.186
+++ demuxer.c	29 Apr 2005 21:57:05 -0000	1.187
@@ -224,7 +224,7 @@
     case DEMUXER_TYPE_SMJPEG:
       demux_close_smjpeg(demuxer); break;
     case DEMUXER_TYPE_DEMUXERS:
-      demux_close_demuxers(demuxer); break;
+      demux_close_demuxers(demuxer); return;
     case DEMUXER_TYPE_AVI: 
     case DEMUXER_TYPE_AVI_NI:
     case DEMUXER_TYPE_AVI_NINI: