summaryrefslogtreecommitdiffstats
path: root/libavcodec/diracdec.c
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-04 19:00:01 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-04 20:34:51 +0100
commit24d20496d2e6e1df6456c5231d892269dd1fcf38 (patch)
tree12173ada798c55bdb4629b2bc3e16809c6c0aef5 /libavcodec/diracdec.c
parent8a4ea9644833d43fdfe8579c0cb569f8a0930206 (diff)
downloadffmpeg-streaming-24d20496d2e6e1df6456c5231d892269dd1fcf38.zip
ffmpeg-streaming-24d20496d2e6e1df6456c5231d892269dd1fcf38.tar.gz
diracdec: clear slice_params_num_buf on allocation failure
Otherwise it can be non-zero next time decode_lowdelay is called, causing slice_params_buf not to be allocated, leading to a NULL pointer dereference. The problem was introduced in commit dcad4677d637cd2f701917e38361fa96b8c9a418. 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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index 5c669ff..bb314d0 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -910,6 +910,7 @@ static int decode_lowdelay(DiracContext *s)
s->slice_params_buf = av_realloc_f(s->slice_params_buf, s->num_x * s->num_y, sizeof(DiracSlice));
if (!s->slice_params_buf) {
av_log(s->avctx, AV_LOG_ERROR, "slice params buffer allocation failure\n");
+ s->slice_params_num_buf = 0;
return AVERROR(ENOMEM);
}
s->slice_params_num_buf = s->num_x * s->num_y;
OpenPOWER on IntegriCloud