[SCM] libav/experimental: matroskadec: Free ebml binary buffer on error

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:07:18 UTC 2013


The following commit has been merged in the experimental branch:
commit 5549aa6d0d695b3563f068cae014a974aa013749
Author: David Conrad <lessen42 at gmail.com>
Date:   Tue May 18 21:21:37 2010 +0000

    matroskadec: Free ebml binary buffer on error
    
    Based on a Chromium patch
    
    Originally committed as revision 23169 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 9126717..1bde1af 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -641,8 +641,10 @@ static int ebml_read_binary(ByteIOContext *pb, int length, EbmlBin *bin)
 
     bin->size = length;
     bin->pos  = url_ftell(pb);
-    if (get_buffer(pb, bin->data, length) != length)
+    if (get_buffer(pb, bin->data, length) != length) {
+        av_freep(&bin->data);
         return AVERROR(EIO);
+    }
 
     return 0;
 }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list