From: Nicolas George <george@nsup.org>
Date: Sun, 29 Dec 2013 09:42:54 +0000 (+0100)
Subject: lavc/utils: check av_frame_alloc() failure.
X-Git-Tag: android-x86-4.4-r1~202
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-ffmpeg.git;a=commitdiff_plain;h=4d70639d536da0574abeffc792d8f36e1fa62655

lavc/utils: check av_frame_alloc() failure.
(cherry picked from commit 38004051b53ddecb518053e6dadafa9adc4fc1b2)

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 38fc3d3c8c..25bb24580f 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1725,6 +1725,8 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
 
     if (samples) {
         frame = av_frame_alloc();
+        if (!frame)
+            return AVERROR(ENOMEM);
 
         if (avctx->frame_size) {
             frame->nb_samples = avctx->frame_size;
@@ -2117,6 +2119,8 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa
     AVFrame *frame = av_frame_alloc();
     int ret, got_frame = 0;
 
+    if (!frame)
+        return AVERROR(ENOMEM);
     if (avctx->get_buffer != avcodec_default_get_buffer) {
         av_log(avctx, AV_LOG_ERROR, "Custom get_buffer() for use with"
                                     "avcodec_decode_audio3() detected. Overriding with avcodec_default_get_buffer\n");