diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-11-17 15:51:16 -0500 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-11-28 11:24:09 -0500 |
| commit | afb84857bf539d7cd58c99ff5983df1b4740d9d2 (patch) | |
| tree | a0e4aaf4e898e4f58af9cddf239c74673c205f3b /libavfilter/vf_colorspace.c | |
| parent | bda6f2937ea1be1f6d0d95374b4e9db2a70db288 (diff) | |
vf_colorspace: Forbid odd dimensions
This prevents writing past bounds.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavfilter/vf_colorspace.c')
| -rw-r--r-- | libavfilter/vf_colorspace.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c index c7a2286813..0024505a44 100644 --- a/libavfilter/vf_colorspace.c +++ b/libavfilter/vf_colorspace.c @@ -168,7 +168,7 @@ typedef struct ColorSpaceContext { int did_warn_range; } ColorSpaceContext; -// FIXME deal with odd width/heights (or just forbid it) +// FIXME deal with odd width/heights // FIXME faster linearize/delinearize implementation (integer pow) // FIXME bt2020cl support (linearization between yuv/rgb step instead of between rgb/xyz) // FIXME test that the values in (de)lin_lut don't exceed their container storage @@ -1031,8 +1031,15 @@ static int query_formats(AVFilterContext *ctx) static int config_props(AVFilterLink *outlink) { + AVFilterContext *ctx = outlink->dst; AVFilterLink *inlink = outlink->src->inputs[0]; + if (inlink->w % 2 || inlink->h % 2) { + av_log(ctx, AV_LOG_ERROR, "Invalid odd size (%dx%d)\n", + inlink->w, inlink->h); + return AVERROR_PATCHWELCOME; + } + outlink->w = inlink->w; outlink->h = inlink->h; outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; |