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:11:25 -0300
commit25273ef23aef4aa6bd4517a63bca826d4092f345 (patch)
tree628767b4a29b9a0e662f7e7c261dbed5d6c354b5
parent1529dfb73a5157dcb8762051ec4c8d8341762478 (diff)
downloadffmpeg-25273ef23aef4aa6bd4517a63bca826d4092f345.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 5081307603..e17dc854f5 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);