[FFmpeg-cvslog] nutdec: Prevent leaks on memory error

Vittorio Giovara git at videolan.org
Thu Mar 12 22:26:36 CET 2015


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Mar 11 19:24:59 2015 +0000| [5a2645cafeca1c2207ac55cc831c3349572a82ed] | committer: Vittorio Giovara

nutdec: Prevent leaks on memory error

Bug-Id: CID 205122 / CID 205123

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

 libavformat/nutdec.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 87d29f1..71eaba4 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -615,8 +615,10 @@ static int find_and_decode_index(NUTContext *nut)
     GET_V(syncpoint_count, tmp < INT_MAX / 8 && tmp > 0);
     syncpoints   = av_malloc(sizeof(int64_t) *  syncpoint_count);
     has_keyframe = av_malloc(sizeof(int8_t)  * (syncpoint_count + 1));
-    if (!syncpoints || !has_keyframe)
-        return AVERROR(ENOMEM);
+    if (!syncpoints || !has_keyframe) {
+        ret = AVERROR(ENOMEM);
+        goto fail;
+    }
     for (i = 0; i < syncpoint_count; i++) {
         syncpoints[i] = ffio_read_varlen(bc);
         if (syncpoints[i] <= 0)



More information about the ffmpeg-cvslog mailing list