[libav-commits] dvdsubdec: Do not leak on failure path

Luca Barbato git at libav.org
Fri Nov 21 13:47:16 CET 2014


Module: libav
Branch: master
Commit: d466d82faaf6e0e57a3a4be5e38e3902ef251ac3

Author:    Luca Barbato <lu_zero at gentoo.org>
Committer: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:      Sun Nov  9 08:48:47 2014 +0100

dvdsubdec: Do not leak on failure path

CC: libav-stable at libav.org
Bug-Id: CID 1198262

---

 libavcodec/dvdsubdec.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index 5d6db41..15abac0 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -503,6 +503,7 @@ static av_cold int dvdsub_init(AVCodecContext *avctx)
 {
     DVDSubContext *ctx = avctx->priv_data;
     char *data, *cur;
+    int ret = 0;
 
     if (!avctx->extradata || !avctx->extradata_size)
         return 0;
@@ -527,16 +528,18 @@ static av_cold int dvdsub_init(AVCodecContext *avctx)
         } else if (!strncmp("size:", cur, 5)) {
             int w, h;
             if (sscanf(cur + 5, "%dx%d", &w, &h) == 2) {
-               int ret = ff_set_dimensions(avctx, w, h);
+               ret = ff_set_dimensions(avctx, w, h);
                if (ret < 0)
-                   return ret;
+                   goto fail;
             }
         }
         cur += strcspn(cur, "\n\r");
         cur += strspn(cur, "\n\r");
     }
+
+fail:
     av_free(data);
-    return 0;
+    return ret;
 }
 
 AVCodec ff_dvdsub_decoder = {



More information about the libav-commits mailing list