Merge commit '3ad825793a43253154bed05827f27425fc0757df'

[ffmpeg] / libavfilter / vf_pad.c

diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index 725dc29e961d759f8cf72b71b89bb9ff3cc42907..ed155578e11f1ced0232f9076f8c58e923e8c935 100644 (file)
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -197,7 +197,10 @@ static int config_input(AVFilterLink *inlink)
            inlink->w, inlink->h, s->w, s->h, s->x, s->y,
            s->rgba_color[0], s->rgba_color[1], s->rgba_color[2], s->rgba_color[3]);
 
-    if (s->w <= 0 || s->h <= 0) {
+    if (s->x <  0 || s->y <  0                      ||
+        s->w <= 0 || s->h <= 0                      ||
+        (unsigned)s->x + (unsigned)inlink->w > s->w ||
+        (unsigned)s->y + (unsigned)inlink->h > s->h) {
         av_log(ctx, AV_LOG_ERROR,
                "Input area %d:%d:%d:%d not within the padded area 0:0:%d:%d or zero-sized\n",
                s->x, s->y, s->x + inlink->w, s->y + inlink->h, s->w, s->h);