[FFmpeg-cvslog] vp56: Check av_frame_ref() return code

Michael Niedermayer git at videolan.org
Tue Mar 19 15:34:11 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 19 15:22:56 2013 +0100| [feeb8ca56dc08bda19174502a687ae262ea3ee21] | committer: Michael Niedermayer

vp56: Check av_frame_ref() return code

Fixes CID991837

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

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

 libavcodec/vp56.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index 15691e0..6bf391c 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -502,6 +502,7 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     int remaining_buf_size = avpkt->size;
     int av_uninit(alpha_offset);
     int i, res;
+    int ret;
 
     if (s->has_alpha) {
         if (remaining_buf_size < 3)
@@ -529,7 +530,10 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 
     if (s->has_alpha) {
         av_frame_unref(s->alpha_context->frames[VP56_FRAME_CURRENT]);
-        av_frame_ref(s->alpha_context->frames[VP56_FRAME_CURRENT], p);
+        if ((ret = av_frame_ref(s->alpha_context->frames[VP56_FRAME_CURRENT], p)) < 0) {
+            av_frame_unref(p);
+            return ret;
+        }
     }
 
     if (res == VP56_SIZE_CHANGE) {



More information about the ffmpeg-cvslog mailing list