[FFmpeg-cvslog] lavc/utils: check av_frame_alloc() failure.

Nicolas George git at videolan.org
Tue Jan 7 21:35:32 CET 2014


ffmpeg | branch: release/2.1 | Nicolas George <george at nsup.org> | Sun Dec 29 10:42:54 2013 +0100| [4d70639d536da0574abeffc792d8f36e1fa62655] | committer: Michael Niedermayer

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

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

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

 libavcodec/utils.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 38fc3d3..25bb245 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");



More information about the ffmpeg-cvslog mailing list