]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/vp9: prevent null pointer use on init_frames() failure
authorPeter Ross <pross@xvid.org>
Sat, 25 Apr 2020 01:25:15 +0000 (11:25 +1000)
committerPeter Ross <pross@xvid.org>
Sat, 25 Apr 2020 02:11:11 +0000 (12:11 +1000)
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: James Almer <jamrial@gmail.com>
libavcodec/vp9.c

index 2a3a4555b94b16fc05004d6928cf79ba0f3d7899..b356b24515ef435180508bb471fdd71ee5fcbfd0 100644 (file)
@@ -1216,17 +1216,14 @@ static av_cold int vp9_decode_free(AVCodecContext *avctx)
     int 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_buffer_pool_uninit(&s->frame_extradata_pool);
     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);
-        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);
     }