From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 18 Jan 2015 20:25:06 +0000 (+0100)
Subject: avcodec/svq1enc: fix error handling/cleanup in case of ff_get_buffer() or scratchbuff... 
X-Git-Tag: android-x86-6.0-r1~868
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=79888388e7c4ca596354f1c093e1c655df7824b8;p=android-x86%2Fexternal-ffmpeg.git

avcodec/svq1enc: fix error handling/cleanup in case of ff_get_buffer() or scratchbuffer alloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index 552f39d381..0c5971b4bb 100644
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -590,14 +590,20 @@ static int svq1_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     }
 
     if (!s->current_picture->data[0]) {
-        if ((ret = ff_get_buffer(avctx, s->current_picture, 0))< 0 ||
-            (ret = ff_get_buffer(avctx, s->last_picture, 0))   < 0) {
+        if ((ret = ff_get_buffer(avctx, s->current_picture, 0)) < 0) {
             return ret;
         }
-        s->scratchbuf = av_malloc(s->current_picture->linesize[0] * 16 * 3);
     }
-    if (!s->scratchbuf)
-        return AVERROR(ENOMEM);
+    if (!s->last_picture->data[0]) {
+        if ((ret = ff_get_buffer(avctx, s->last_picture, 0)) < 0) {
+            return ret;
+        }
+    }
+    if (!s->scratchbuf) {
+        s->scratchbuf = av_malloc_array(s->current_picture->linesize[0], 16 * 3);
+        if (!s->scratchbuf)
+            return AVERROR(ENOMEM);
+    }
 
     FFSWAP(AVFrame*, s->current_picture, s->last_picture);