[libav-stable] xmv: do not leak memory in the error paths in xmv_read_header()

Anton Khirnov git at libav.org
Thu Apr 4 07:58:20 CEST 2013


Module: libav
Branch: master
Commit: f8080bd13b5f7fc48204b17fa59a5ce9feb15f07

Author:    Anton Khirnov <anton at khirnov.net>
Committer: Anton Khirnov <anton at khirnov.net>
Date:      Thu Mar 28 10:34:47 2013 +0100

xmv: do not leak memory in the error paths in xmv_read_header()

CC: libav-stable at libav.org

---

 libavformat/xmv.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index e9b2b0d..bc7c3c9 100644
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -188,8 +188,10 @@ static int xmv_read_header(AVFormatContext *s)
         return AVERROR(ENOMEM);
 
     xmv->audio = av_malloc(xmv->audio_track_count * sizeof(XMVAudioPacket));
-    if (!xmv->audio)
-        return AVERROR(ENOMEM);
+    if (!xmv->audio) {
+        ret = AVERROR(ENOMEM);
+        goto fail;
+    }
 
     for (audio_track = 0; audio_track < xmv->audio_track_count; audio_track++) {
         XMVAudioTrack  *track  = &xmv->audio_tracks[audio_track];
@@ -230,8 +232,10 @@ static int xmv_read_header(AVFormatContext *s)
         }
 
         ast = avformat_new_stream(s, NULL);
-        if (!ast)
-            return AVERROR(ENOMEM);
+        if (!ast) {
+            ret = AVERROR(ENOMEM);
+            goto fail;
+        }
 
         ast->codec->codec_type            = AVMEDIA_TYPE_AUDIO;
         ast->codec->codec_id              = track->codec_id;



More information about the libav-stable mailing list