aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2008-12-28 23:23:59 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2008-12-28 23:23:59 +0000
commitc49a3ec30aaa8042335656982054f02847c03aae (patch)
treec2c6d193ae76170edd4906de2547bbbec518c8ac
parent133e5c40265682db10ed42b75a6e179378012f03 (diff)
downloadffmpeg-c49a3ec30aaa8042335656982054f02847c03aae.tar.gz
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. Originally committed as revision 16378 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/rdt.c1
-rw-r--r--libavformat/rmdec.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rdt.c b/libavformat/rdt.c
index a3e468d9ea..6ed1137841 100644
--- a/libavformat/rdt.c
+++ b/libavformat/rdt.c
@@ -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);
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index e8ecc927d1..01e335be06 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -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,