Commit 1217b06a authored by Peter Ross's avatar Peter Ross

avcodec/vp9: prevent null pointer use on init_frames() failure

Signed-off-by: 's avatarPeter Ross <pross@xvid.org>
Reviewed-by: 's avatarJames Almer <jamrial@gmail.com>
parent 5a2a1990
...@@ -1216,17 +1216,14 @@ static av_cold int vp9_decode_free(AVCodecContext *avctx) ...@@ -1216,17 +1216,14 @@ static av_cold int vp9_decode_free(AVCodecContext *avctx)
int i; int i;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (s->s.frames[i].tf.f->buf[0]) vp9_frame_unref(avctx, &s->s.frames[i]);
vp9_frame_unref(avctx, &s->s.frames[i]);
av_frame_free(&s->s.frames[i].tf.f); av_frame_free(&s->s.frames[i].tf.f);
} }
av_buffer_pool_uninit(&s->frame_extradata_pool); av_buffer_pool_uninit(&s->frame_extradata_pool);
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (s->s.refs[i].f->buf[0]) ff_thread_release_buffer(avctx, &s->s.refs[i]);
ff_thread_release_buffer(avctx, &s->s.refs[i]);
av_frame_free(&s->s.refs[i].f); av_frame_free(&s->s.refs[i].f);
if (s->next_refs[i].f->buf[0]) ff_thread_release_buffer(avctx, &s->next_refs[i]);
ff_thread_release_buffer(avctx, &s->next_refs[i]);
av_frame_free(&s->next_refs[i].f); av_frame_free(&s->next_refs[i].f);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment