har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/bsf: Fix segfault when freeing half-allocated BSF

Browse Source 
When allocating a BSF fails, it could happen that the BSF's close
function has been called despite a failure to allocate the private data.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
(cherry picked from commit 9bf2b32da048732ad79e075dfefd40777e9f935a)
This commit is contained in:
Andreas Rheinhardt 2021-04-02 14:17:56 +02:00
parent 82b9da7662
commit 60433ae94f
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libavcodec/bsf.c
View File

@ -45,14 +45,15 @@ void av_bsf_free(AVBSFContext **pctx)
return; return;
ctx = *pctx; ctx = *pctx;
if (ctx->filter->close) if (ctx->internal) {
ctx->filter->close(ctx); if (ctx->filter->close)
ctx->filter->close(ctx);
av_packet_free(&ctx->internal->buffer_pkt);
av_freep(&ctx->internal);
}
if (ctx->filter->priv_class && ctx->priv_data) if (ctx->filter->priv_class && ctx->priv_data)
av_opt_free(ctx->priv_data); av_opt_free(ctx->priv_data);
if (ctx->internal)
av_packet_free(&ctx->internal->buffer_pkt);
av_freep(&ctx->internal);
av_freep(&ctx->priv_data); av_freep(&ctx->priv_data);
avcodec_parameters_free(&ctx->par_in); avcodec_parameters_free(&ctx->par_in);
@ -110,20 +111,6 @@ int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx)
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
bsfi = av_mallocz(sizeof(*bsfi));
if (!bsfi) {
ret = AVERROR(ENOMEM);
goto fail;
}
ctx->internal = bsfi;
bsfi->buffer_pkt = av_packet_alloc();
if (!bsfi->buffer_pkt) {
ret = AVERROR(ENOMEM);
goto fail;
}
/* allocate priv data and init private options */ /* allocate priv data and init private options */
if (filter->priv_data_size) { if (filter->priv_data_size) {
ctx->priv_data = av_mallocz(filter->priv_data_size); ctx->priv_data = av_mallocz(filter->priv_data_size);
@ -136,6 +123,20 @@ int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx)
av_opt_set_defaults(ctx->priv_data); av_opt_set_defaults(ctx->priv_data);
} }
} }
/* Allocate AVBSFInternal; must happen after priv_data has been allocated
* so that a filter->close needing priv_data is never called without. */
bsfi = av_mallocz(sizeof(*bsfi));
if (!bsfi) {
ret = AVERROR(ENOMEM);
goto fail;
}
ctx->internal = bsfi;
bsfi->buffer_pkt = av_packet_alloc();
if (!bsfi->buffer_pkt) {
ret = AVERROR(ENOMEM);
goto fail;
}
*pctx = ctx; *pctx = ctx;
return 0; return 0;