mirror of
https://github.com/librempeg/librempeg
synced 2024-11-22 00:51:37 +00:00
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. Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
parent
ac4f2cdede
commit
a7d825d753
@ -2040,6 +2040,7 @@ static int context_init_threaded(SwsContext *c,
|
||||
if (!c->slice_ctx[i])
|
||||
return AVERROR(ENOMEM);
|
||||
|
||||
c->nb_slice_ctx++;
|
||||
c->slice_ctx[i]->parent = c;
|
||||
|
||||
ret = av_opt_copy((void*)c->slice_ctx[i], (void*)c);
|
||||
@ -2052,8 +2053,6 @@ static int context_init_threaded(SwsContext *c,
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
c->nb_slice_ctx++;
|
||||
|
||||
if (c->slice_ctx[i]->dither == SWS_DITHER_ED) {
|
||||
av_log(c, AV_LOG_VERBOSE,
|
||||
"Error-diffusion dither is in use, scaling will be single-threaded.");
|
||||
|
Loading…
Reference in New Issue
Block a user