[FFmpeg-cvslog] avcodec/bsf: check that AVBSFInternal was allocated before dereferencing it

James Almer git at videolan.org
Mon Sep 23 16:12:59 EEST 2019


ffmpeg | branch: release/3.4 | James Almer <jamrial at gmail.com> | Sun Sep 22 23:55:49 2019 -0300| [45bf2f4d72f11ea4bf757b413931fc1b43c0d643] | committer: James Almer

avcodec/bsf: check that AVBSFInternal was allocated before dereferencing it

This can happen when av_bsf_free() is called on av_bsf_alloc() failure.

Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit d889ae33962e4ad2b24175418fe89d72ce712179)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45bf2f4d72f11ea4bf757b413931fc1b43c0d643
---

 libavcodec/bsf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c
index 38b423101c..676c271b9c 100644
--- a/libavcodec/bsf.c
+++ b/libavcodec/bsf.c
@@ -47,7 +47,8 @@ void av_bsf_free(AVBSFContext **pctx)
 
     av_opt_free(ctx);
 
-    av_packet_free(&ctx->internal->buffer_pkt);
+    if (ctx->internal)
+        av_packet_free(&ctx->internal->buffer_pkt);
     av_freep(&ctx->internal);
     av_freep(&ctx->priv_data);
 



More information about the ffmpeg-cvslog mailing list