[vlc-commits] contrib: libmad: fix memory leak

Hannes Domani git at videolan.org
Tue Jul 19 23:23:02 CEST 2016


vlc/vlc-2.2 | branch: master | Hannes Domani <ssbssa at yahoo.de> | Fri Jul  8 18:31:29 2016 +0200| [c32dd114a67e51fba4dc06667f8698b46ed80947] | committer: Jean-Baptiste Kempf

contrib: libmad: fix memory leak

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 94821a37ff9ab6b133f8a95e5f7ea28c64c3a701)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c32dd114a67e51fba4dc06667f8698b46ed80947
---

 contrib/src/mad/check-bitstream-length.patch |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/src/mad/check-bitstream-length.patch b/contrib/src/mad/check-bitstream-length.patch
index 0540559..f36e158 100644
--- a/contrib/src/mad/check-bitstream-length.patch
+++ b/contrib/src/mad/check-bitstream-length.patch
@@ -373,7 +373,7 @@
  
    if (decode_header(header, stream) == -1)
      goto fail;
-@@ -460,14 +460,14 @@
+@@ -460,14 +460,16 @@
    /* ancillary_data() */
  
    if (frame->header.layer != MAD_LAYER_III) {
@@ -385,6 +385,8 @@
  
 -    stream->anc_ptr    = stream->ptr;
 -    stream->anc_bitlen = mad_bit_length(&stream->ptr, &next_frame);
++    if (stream->l_ptr != stream->l_anc_ptr)
++      free(stream->l_anc_ptr);
 +    stream->l_anc_ptr    = stream->l_ptr;
 +    stream->anc_bitlen = mad_bit_w_len_length(stream->l_ptr, &next_frame);
  



More information about the vlc-commits mailing list