[FFmpeg-cvslog] diracdec: check if reference could not be allocated

Andreas Cadhalpun git at videolan.org
Wed Jun 17 22:09:51 CEST 2015


ffmpeg | branch: release/2.2 | Andreas Cadhalpun <andreas.cadhalpun at googlemail.com> | Tue May  5 23:51:48 2015 +0200| [c9c5bd8c89b6e3cc09e50c3b053cd8a083fbddc6] | committer: Michael Niedermayer

diracdec: check if reference could not be allocated

s->ref_pics[i] is later used as ref argument of interpolate_refplane,
where it is dereferenced.

If it is NULL, it causes a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d93181ef3eacdb862d93448f31c97765a523d1db)

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

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

 libavcodec/diracdec.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index c9c43fd..679fbcf 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -1745,6 +1745,12 @@ static int dirac_decode_picture_header(DiracContext *s)
                     get_buffer_with_edge(s->avctx, s->ref_pics[i]->avframe, AV_GET_BUFFER_FLAG_REF);
                     break;
                 }
+
+        if (!s->ref_pics[i]) {
+            av_log(s->avctx, AV_LOG_ERROR, "Reference could not be allocated\n");
+            return -1;
+        }
+
     }
 
     /* retire the reference frames that are not used anymore */



More information about the ffmpeg-cvslog mailing list