[FFmpeg-cvslog] r16378 - in trunk/libavformat: rdt.c rmdec.c

[rbultje]

Author: rbultje
Date: Mon Dec 29 00:23:59 2008
New Revision: 16378

Log:
Fix double free which happens for playback of .rm files after r16365. See
"rmdec.c: double free" discussion on mailinglist, patch with suggestions
from Reimar Doffinger.

Modified:
   trunk/libavformat/rdt.c
   trunk/libavformat/rmdec.c

Modified: trunk/libavformat/rdt.c
==============================================================================
--- trunk/libavformat/rdt.c	Mon Dec 29 00:12:46 2008	(r16377)
+++ trunk/libavformat/rdt.c	Mon Dec 29 00:23:59 2008	(r16378)
@@ -438,6 +438,7 @@ static void
 rdt_free_extradata (PayloadContext *rdt)
 {
     ff_rm_free_rmstream(rdt->rmst[0]);
+    av_free(rdt->rmst[0]);
     if (rdt->rmctx)
         av_close_input_stream(rdt->rmctx);
     av_freep(&rdt->mlti_data);

Modified: trunk/libavformat/rmdec.c
==============================================================================
--- trunk/libavformat/rmdec.c	Mon Dec 29 00:12:46 2008	(r16377)
+++ trunk/libavformat/rmdec.c	Mon Dec 29 00:23:59 2008	(r16378)
@@ -83,7 +83,6 @@ void ff_rm_free_rmstream (RMStream *rms)
 {
     av_free(rms->videobuf);
     av_free(rms->audiobuf);
-    av_free(rms);
 }
 
 static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb,