[FFmpeg-cvslog] avcodec/bsf: check that AVBSFInternal was allocated before dereferencing it
James Almer
git at videolan.org
Mon Sep 23 16:13:02 EEST 2019
ffmpeg | branch: release/4.0 | James Almer <jamrial at gmail.com> | Sun Sep 22 23:55:49 2019 -0300| [693f3926ddd904e9c9f6ed79b5dbc8d3d205be1c] | 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=693f3926ddd904e9c9f6ed79b5dbc8d3d205be1c
---
libavcodec/bsf.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c
index bd611ea16b..8970b6cdbb 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