Merge commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Apr 2015 20:15:16 +0000 (22:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Apr 2015 20:15:22 +0000 (22:15 +0200)
* commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641':
  xcbgrab: Validate the capture area

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/xcbgrab.c

index 287899541212673d8a82b901b1c73cede1ff73f2..15512cd15fa33e53fb3feb0059967f83e279dfe9 100644 (file)
@@ -533,8 +533,17 @@ static int create_stream(AVFormatContext *s)
     gc  = xcb_get_geometry(c->conn, c->screen->root);
     geo = xcb_get_geometry_reply(c->conn, gc, NULL);
 
-    c->width      = FFMIN(geo->width, c->width);
-    c->height     = FFMIN(geo->height, c->height);
+    if (c->x + c->width >= geo->width ||
+        c->y + c->height >= geo->height) {
+        av_log(s, AV_LOG_ERROR,
+               "Capture area %dx%d at position %d.%d "
+               "outside the screen size %dx%d\n",
+               c->width, c->height,
+               c->x, c->y,
+               geo->width, geo->height);
+        return AVERROR(EINVAL);
+    }
+
     c->time_base  = (AVRational){ st->avg_frame_rate.den,
                                   st->avg_frame_rate.num };
     c->time_frame = av_gettime();