RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-22 23:33:07 +00:00
Code Issues Projects Releases Wiki Activity

avfilter/vf_paletteuse: Fix potential double-free of AVFrame

Browse Source 
apply_palette() would free an AVFrame given to it only via an AVFrame *
(and not via AVFrame **) in three of its four exists (namely in the
normal path and in two error paths). So upon error the caller has no way
to know whether the frame has already been freed or not;
load_apply_palette(), the only caller, opted to free the frame in this
scenario.

This commit changes this by making apply_palette not freeing the frame
at all, which is left to load_apply_palette().

Fixes Coverity issue #1452434.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Andreas Rheinhardt 2020-01-27 09:28:20 +01:00 committed by Michael Niedermayer
parent 4566cfed9c
commit adea33f465
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/vf_paletteuse.c
View File

@ -903,7 +903,6 @@ static int apply_palette(AVFilterLink *inlink, AVFrame *in, AVFrame **outf)
AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!out) { if (!out) {
av_frame_free(&in);
*outf = NULL; *outf = NULL;
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -916,7 +915,6 @@ static int apply_palette(AVFilterLink *inlink, AVFrame *in, AVFrame **outf)
if (av_frame_ref(s->last_in, in) < 0 || if (av_frame_ref(s->last_in, in) < 0 ||
av_frame_ref(s->last_out, out) < 0 || av_frame_ref(s->last_out, out) < 0 ||
av_frame_make_writable(s->last_in) < 0) { av_frame_make_writable(s->last_in) < 0) {
av_frame_free(&in);
av_frame_free(&out); av_frame_free(&out);
*outf = NULL; *outf = NULL;
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -934,7 +932,6 @@ static int apply_palette(AVFilterLink *inlink, AVFrame *in, AVFrame **outf)
memcpy(out->data[1], s->palette, AVPALETTE_SIZE); memcpy(out->data[1], s->palette, AVPALETTE_SIZE);
if (s->calc_mean_err) if (s->calc_mean_err)
debug_mean_error(s, in, out, inlink->frame_count_out); debug_mean_error(s, in, out, inlink->frame_count_out);
av_frame_free(&in);
*outf = out; *outf = out;
return 0; return 0;
} }
@ -1023,20 +1020,17 @@ static int load_apply_palette(FFFrameSync *fs)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (!master || !second) { if (!master || !second) {
ret = AVERROR_BUG; av_frame_free(&master);
goto error; return AVERROR_BUG;
} }
if (!s->palette_loaded) { if (!s->palette_loaded) {
load_palette(s, second); load_palette(s, second);
} }
ret = apply_palette(inlink, master, &out); ret = apply_palette(inlink, master, &out);
if (ret < 0)
goto error;
return ff_filter_frame(ctx->outputs[0], out);
error:
av_frame_free(&master); av_frame_free(&master);
return ret; if (ret < 0)
return ret;
return ff_filter_frame(ctx->outputs[0], out);
} }
#define DEFINE_SET_FRAME(color_search, name, value) \ #define DEFINE_SET_FRAME(color_search, name, value) \