summaryrefslogtreecommitdiff
path: root/libavfilter/vf_minterpolate.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-10-06 14:35:25 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-10-09 16:38:28 +0200
commitbb13cdbe279d92f595243a9b3e2b91fb48cf146c (patch)
treeb65e662de91dbb843da2a04f1372c72bb86b9a3c /libavfilter/vf_minterpolate.c
parent0d156eb58a2bfb136c6481611fad7505b3a2c0c1 (diff)
avfilter/vf_minterpolate: Reject too small dimensions
The latter code relies upon the dimensions to be not too small; otherwise one will call av_clip() with min > max lateron which aborts in case ASSERT_LEVEL is >= 2 or one will get a nonsense result that may lead to a heap-buffer-overflow/underflow. The latter has happened in ticket #8248 which this commit fixes. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavfilter/vf_minterpolate.c')
-rw-r--r--libavfilter/vf_minterpolate.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c
index c9ce80420d..e1fe5e32b5 100644
--- a/libavfilter/vf_minterpolate.c
+++ b/libavfilter/vf_minterpolate.c
@@ -363,6 +363,11 @@ static int config_input(AVFilterLink *inlink)
}
if (mi_ctx->mi_mode == MI_MODE_MCI) {
+ if (mi_ctx->b_width < 2 || mi_ctx->b_height < 2) {
+ av_log(inlink->dst, AV_LOG_ERROR, "Height or width < %d\n",
+ 2 * mi_ctx->mb_size);
+ return AVERROR(EINVAL);
+ }
mi_ctx->pixel_mvs = av_mallocz_array(width * height, sizeof(PixelMVS));
mi_ctx->pixel_weights = av_mallocz_array(width * height, sizeof(PixelWeights));
mi_ctx->pixel_refs = av_mallocz_array(width * height, sizeof(PixelRefs));