RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/vaapi_{decode, av1}: Fix memory leak in fail codepath 

Signed-off-by: Fei Wang <fei.w.wang@intel.com>
This commit is contained in:
Fei Wang 2024-07-01 16:36:12 +08:00 committed by Haihao Xiang
parent 9c8881cb35
commit 246600974f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/vaapi_av1.c
View File

@ -404,14 +404,15 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx,
nb_params = s->tg_end - s->tg_start + 1;
if (ctx->nb_slice_params < nb_params) {
ctx->slice_params = av_realloc_array(ctx->slice_params,
nb_params,
sizeof(*ctx->slice_params));
if (!ctx->slice_params) {
VASliceParameterBufferAV1 *tmp = av_realloc_array(ctx->slice_params,
nb_params,
sizeof(*ctx->slice_params));
if (!tmp) {
ctx->nb_slice_params = 0;
err = AVERROR(ENOMEM);
goto fail;
}
ctx->slice_params = tmp;
ctx->nb_slice_params = nb_params;
}

5
libavcodec/vaapi_decode.c
View File

@ -74,13 +74,14 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
av_assert0(pic->nb_slices <= pic->slices_allocated);
if (pic->nb_slices == pic->slices_allocated) {
pic->slice_buffers =
VABufferID *tmp =
av_realloc_array(pic->slice_buffers,
pic->slices_allocated ? pic->slices_allocated * 2 : 64,
2 * sizeof(*pic->slice_buffers));
if (!pic->slice_buffers)
if (!tmp)
return AVERROR(ENOMEM);
pic->slice_buffers = tmp;
pic->slices_allocated = pic->slices_allocated ? pic->slices_allocated * 2 : 64;
}
av_assert0(pic->nb_slices + 1 <= pic->slices_allocated);