aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2019-09-22 23:55:49 -0300
committerJames Almer <jamrial@gmail.com>2019-09-23 10:08:57 -0300
commit7df1cb3dce1e8cac2021b6773d9ab8ed511cd7ce (patch)
treeba5310569c219a8842d7adc5effe61d6210186a3
parent9b236547f480a012cab32f8cad2dfe02774537c1 (diff)
downloadffmpeg-7df1cb3dce1e8cac2021b6773d9ab8ed511cd7ce.tar.gz
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@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit d889ae33962e4ad2b24175418fe89d72ce712179)
-rw-r--r--libavcodec/bsf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c
index ac2024b8db..bfcf4af4d0 100644
--- a/libavcodec/bsf.c
+++ b/libavcodec/bsf.c
@@ -48,7 +48,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);