[FFmpeg-cvslog] matroska: Fix leaking memory allocated for laces.

[Dale Curtis]

ffmpeg | branch: master | Dale Curtis <dalecurtis at chromium.org> | Thu Apr 12 17:14:35 2012 -0700| [b5ada68ead1ff92e1fab7ddc9b0ac60d5da3edeb] | committer: Michael Niedermayer

matroska: Fix leaking memory allocated for laces.

During error conditions matroska_parse_block may exit without
freeing the memory allocated for laces.

Found via valgrind: http://pastebin.com/E54k8QFU

Signed-off-by: Dale Curtis <dalecurtis at chromium.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5ada68ead1ff92e1fab7ddc9b0ac60d5da3edeb
---

 libavformat/matroskadec.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 6d7401b..856508c 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1940,6 +1940,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
                         if (size < cfs * h / 2) {
                             av_log(matroska->ctx, AV_LOG_ERROR,
                                    "Corrupt int4 RM-style audio packet size\n");
+                            av_free(lace_size);
                             return AVERROR_INVALIDDATA;
                         }
                         for (x=0; x<h/2; x++)
@@ -1949,6 +1950,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
                         if (size < w) {
                             av_log(matroska->ctx, AV_LOG_ERROR,
                                    "Corrupt sipr RM-style audio packet size\n");
+                            av_free(lace_size);
                             return AVERROR_INVALIDDATA;
                         }
                         memcpy(track->audio.buf + y*w, data, w);
@@ -1956,6 +1958,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
                         if (size < sps * w / sps) {
                             av_log(matroska->ctx, AV_LOG_ERROR,
                                    "Corrupt generic RM-style audio packet size\n");
+                            av_free(lace_size);
                             return AVERROR_INVALIDDATA;
                         }
                         for (x=0; x<w/sps; x++)