From: Rick Kern <kernrj@gmail.com>
Date: Wed, 27 Apr 2016 14:53:10 +0000 (-0400)
Subject: lavc/videotoolboxenc: Handle out-of-memory and fix memory leak
X-Git-Tag: android-x86-7.1-r1~5380
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=272dd437bc6b663200bc6d2c013b02c9eaf64a49;p=android-x86%2Fexternal-ffmpeg.git

lavc/videotoolboxenc: Handle out-of-memory and fix memory leak

Signed-off-by: Rick Kern <kernrj@gmail.com>
---

diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index 72c7ba8994..f53015ac9c 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -706,9 +706,14 @@ static av_cold int vtenc_init(AVCodecContext *avctx)
         CFNumberRef interval = CFNumberCreate(kCFAllocatorDefault,
                                               kCFNumberIntType,
                                               &avctx->gop_size);
+        if (!interval) {
+            return AVERROR(ENOMEM);
+        }
+
         status = VTSessionSetProperty(vtctx->session,
                                       kVTCompressionPropertyKey_MaxKeyFrameInterval,
                                       interval);
+        CFRelease(interval);
 
         if (status) {
             av_log(avctx, AV_LOG_ERROR, "Error setting 'max key-frame interval' property: %d\n", status);