diff options
| author | Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> | 2015-05-05 23:51:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 23:25:22 +0200 |
| commit | c646ee3da747337adfb865e703efeb6269ec541d (patch) | |
| tree | 418c14b3617ce174eb5315f06ade9e5cf6bcb07a | |
| parent | 68c11b665458bf43d5f751131c43c6e402e5e02f (diff) | |
| download | ffmpeg-c646ee3da747337adfb865e703efeb6269ec541d.tar.gz | |
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@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d93181ef3eacdb862d93448f31c97765a523d1db)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/diracdec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 533f37b460..1bfe6be0a4 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1747,6 +1747,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 */ |