# HG changeset patch # User rbultje # Date 1230506639 0 # Node ID aff3f79228d3fd7f039f9ce049882a7f7b6e9b35 # Parent b432c9e980028bb68d42a6a8f43054a1a7871d96 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. diff -r b432c9e98002 -r aff3f79228d3 rdt.c --- 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); diff -r b432c9e98002 -r aff3f79228d3 rmdec.c --- 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,