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

swscale/utils: fix leak on threaded ctx init failure 

This count gets incremented after init succeeds, when it should be
incremented after *alloc* succeeds. Otherwise, we leak the context on
failure.

There are no negative consequences of incrementing for
allocated-but-not-initialized contexts, as the only functions that
reference it will, in the worst case, simply behave as if called on
allocated-but-not-initialized contexts, which is in line with expected
behavior when sws_init_context() fails.
This commit is contained in:
Niklas Haas 2024-07-09 16:41:01 +02:00
parent 36aee69f0d
commit 4ec45aca36
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libswscale/utils.c
View File

@ -2042,6 +2042,7 @@ static int context_init_threaded(SwsContext *c,
if (!c->slice_ctx[i]) if (!c->slice_ctx[i])
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
c->nb_slice_ctx++;
c->slice_ctx[i]->parent = c; c->slice_ctx[i]->parent = c;
ret = av_opt_copy((void*)c->slice_ctx[i], (void*)c); ret = av_opt_copy((void*)c->slice_ctx[i], (void*)c);
@ -2054,8 +2055,6 @@ static int context_init_threaded(SwsContext *c,
if (ret < 0) if (ret < 0)
return ret; return ret;
c->nb_slice_ctx++;
if (c->slice_ctx[i]->dither == SWS_DITHER_ED) { if (c->slice_ctx[i]->dither == SWS_DITHER_ED) {
av_log(c, AV_LOG_VERBOSE, av_log(c, AV_LOG_VERBOSE,
"Error-diffusion dither is in use, scaling will be single-threaded."); "Error-diffusion dither is in use, scaling will be single-threaded.");