Browse code

avfilter/vf_pad: revert part of 57c3670896c69714ca

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Paul B Mahol authored on 2017/05/13 00:37:20
Showing 1 changed files
... ...
@@ -197,7 +197,10 @@ static int config_input(AVFilterLink *inlink)
197 197
            inlink->w, inlink->h, s->w, s->h, s->x, s->y,
198 198
            s->rgba_color[0], s->rgba_color[1], s->rgba_color[2], s->rgba_color[3]);
199 199
 
200
-    if (s->w <= 0 || s->h <= 0) {
200
+    if (s->x <  0 || s->y <  0                      ||
201
+        s->w <= 0 || s->h <= 0                      ||
202
+        (unsigned)s->x + (unsigned)inlink->w > s->w ||
203
+        (unsigned)s->y + (unsigned)inlink->h > s->h) {
201 204
         av_log(ctx, AV_LOG_ERROR,
202 205
                "Input area %d:%d:%d:%d not within the padded area 0:0:%d:%d or zero-sized\n",
203 206
                s->x, s->y, s->x + inlink->w, s->y + inlink->h, s->w, s->h);