aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/diracdec.c
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-04 19:00:17 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-04 20:35:23 +0100
commitdb79dedb1ae5dd38432eee3f09155e26f3f2d95a (patch)
treea5f9587dd915e41f429dfd40500cf704adcf3bb5 /libavcodec/diracdec.c
parent24d20496d2e6e1df6456c5231d892269dd1fcf38 (diff)
downloadffmpeg-db79dedb1ae5dd38432eee3f09155e26f3f2d95a.tar.gz
diracdec: check return code of get_buffer_with_edge
If it fails, buffers aren't allocated, causing NULL pointer dereferencing. Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavcodec/diracdec.c')
-rw-r--r--libavcodec/diracdec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index bb314d0df6..e0604af103 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -1975,7 +1975,9 @@ static int dirac_decode_picture_header(DiracContext *s)
for (j = 0; j < MAX_FRAMES; j++)
if (!s->all_frames[j].avframe->data[0]) {
s->ref_pics[i] = &s->all_frames[j];
- get_buffer_with_edge(s->avctx, s->ref_pics[i]->avframe, AV_GET_BUFFER_FLAG_REF);
+ ret = get_buffer_with_edge(s->avctx, s->ref_pics[i]->avframe, AV_GET_BUFFER_FLAG_REF);
+ if (ret < 0)
+ return ret;
break;
}