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

vf_paletteuse: Add error checking to apply_palette 

This fixes a segfault caused by passing NULL to ff_filter_frame
when an error occurs.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2018-01-01 11:28:36 -05:00
parent 500a9bb5ba
commit 6470abc740
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavfilter/vf_paletteuse.c
View File

@ -894,9 +894,9 @@ static void set_processing_window(enum diff_mode diff_mode,
*hp = height; *hp = height;
} }
static AVFrame *apply_palette(AVFilterLink *inlink, AVFrame *in) static int apply_palette(AVFilterLink *inlink, AVFrame *in, AVFrame **outf)
{ {
int x, y, w, h; int x, y, w, h, ret;
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
PaletteUseContext *s = ctx->priv; PaletteUseContext *s = ctx->priv;
AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterLink *outlink = inlink->dst->outputs[0];
@ -904,7 +904,8 @@ static AVFrame *apply_palette(AVFilterLink *inlink, AVFrame *in)
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); av_frame_free(&in);
return NULL; *outf = NULL;
return AVERROR(ENOMEM);
} }
av_frame_copy_props(out, in); av_frame_copy_props(out, in);
@ -918,21 +919,25 @@ static AVFrame *apply_palette(AVFilterLink *inlink, AVFrame *in)
av_frame_make_writable(s->last_in) < 0) { av_frame_make_writable(s->last_in) < 0) {
av_frame_free(&in); av_frame_free(&in);
av_frame_free(&out); av_frame_free(&out);
return NULL; *outf = NULL;
return AVERROR(ENOMEM);
} }
ff_dlog(ctx, "%dx%d rect: (%d;%d) -> (%d,%d) [area:%dx%d]\n", ff_dlog(ctx, "%dx%d rect: (%d;%d) -> (%d,%d) [area:%dx%d]\n",
w, h, x, y, x+w, y+h, in->width, in->height); w, h, x, y, x+w, y+h, in->width, in->height);
if (s->set_frame(s, out, in, x, y, w, h) < 0) { ret = s->set_frame(s, out, in, x, y, w, h);
if (ret < 0) {
av_frame_free(&out); av_frame_free(&out);
return NULL; *outf = NULL;
return ret;
} }
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); av_frame_free(&in);
return out; *outf = out;
return 0;
} }
static int config_output(AVFilterLink *outlink) static int config_output(AVFilterLink *outlink)
@ -1011,7 +1016,7 @@ static int load_apply_palette(FFFrameSync *fs)
AVFilterContext *ctx = fs->parent; AVFilterContext *ctx = fs->parent;
AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *inlink = ctx->inputs[0];
PaletteUseContext *s = ctx->priv; PaletteUseContext *s = ctx->priv;
AVFrame *master, *second, *out; AVFrame *master, *second, *out = NULL;
int ret; int ret;
// writable for error diffusal dithering // writable for error diffusal dithering
@ -1025,7 +1030,9 @@ static int load_apply_palette(FFFrameSync *fs)
if (!s->palette_loaded) { if (!s->palette_loaded) {
load_palette(s, second); load_palette(s, second);
} }
out = apply_palette(inlink, master); ret = apply_palette(inlink, master, &out);
if (ret < 0)
goto error;
return ff_filter_frame(ctx->outputs[0], out); return ff_filter_frame(ctx->outputs[0], out);
error: error: