[SCM] libav/experimental: free subtitle_header before overwriting it to avoid memleak

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:21:12 UTC 2013


The following commit has been merged in the experimental branch:
commit f19c58b4cf0be11cdcfa609ca78265e4b4206091
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Fri Dec 31 00:06:25 2010 +0000

    free subtitle_header before overwriting it to avoid memleak
    
    Originally committed as revision 26176 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index d82f589..ce74735 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -505,6 +505,11 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
         avcodec_set_dimensions(avctx, 0, 0);
     }
 
+    /* if the decoder init function was already called previously,
+       free the already allocated subtitle_header before overwriting it */
+    if (codec->decode)
+        av_freep(&avctx->subtitle_header);
+
 #define SANE_NB_CHANNELS 128U
     if (avctx->channels > SANE_NB_CHANNELS) {
         ret = AVERROR(EINVAL);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list