virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter/vf_thumbnail_cuda: Fix segfaults on uninit

Browse Source 
Uninit crashed if an array containing frames could not be allocated
or config_props() has never been called.

Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-10-05 22:31:03 +02:00
parent baf89ab9a7
commit 06045f4b1d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/vf_thumbnail_cuda.c
View File

@@ -306,6 +306,8 @@ static av_cold void uninit(AVFilterContext *ctx)
{ {
int i; int i;
ThumbnailCudaContext *s = ctx->priv; ThumbnailCudaContext *s = ctx->priv;
if (s->hwctx) {
CudaFunctions *cu = s->hwctx->internal->cuda_dl; CudaFunctions *cu = s->hwctx->internal->cuda_dl;
if (s->data) { if (s->data) {
@@ -317,10 +319,13 @@ static av_cold void uninit(AVFilterContext *ctx)
CHECK_CU(cu->cuModuleUnload(s->cu_module)); CHECK_CU(cu->cuModuleUnload(s->cu_module));
s->cu_module = NULL; s->cu_module = NULL;
} }
}
if (s->frames) {
for (i = 0; i < s->n_frames && s->frames[i].buf; i++) for (i = 0; i < s->n_frames && s->frames[i].buf; i++)
av_frame_free(&s->frames[i].buf); av_frame_free(&s->frames[i].buf);
av_freep(&s->frames); av_freep(&s->frames);
}
} }
static int request_frame(AVFilterLink *link) static int request_frame(AVFilterLink *link)