Mercurial > libavformat.hg

changeset 4138:aff3f79228d3 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author rbultje
date Sun, 28 Dec 2008 23:23:59 +0000
parents b432c9e98002
children b5f97b5a8925
files rdt.c rmdec.c
diffstat 2 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/rdt.c	Sun Dec 28 16:22:42 2008 +0000
+++ b/rdt.c	Sun Dec 28 23:23:59 2008 +0000
@@ -438,6 +438,7 @@
 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);
--- a/rmdec.c	Sun Dec 28 16:22:42 2008 +0000
+++ b/rmdec.c	Sun Dec 28 23:23:59 2008 +0000
@@ -83,7 +83,6 @@
 {
     av_free(rms->videobuf);
     av_free(rms->audiobuf);
-    av_free(rms);
 }
 
 static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb,