From e8c4db0d4d07738fed716b1d2f20c85aac944641 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Sat, 14 Mar 2015 12:30:11 +0100
Subject: [PATCH] xcbgrab: Validate the capture area
And notify why the capture is impossible.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---
libavdevice/xcbgrab.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c
index decb7a7a309..3de4b00a540 100644
--- a/libavdevice/xcbgrab.c
+++ b/libavdevice/xcbgrab.c
@@ -528,8 +528,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();
--
GitLab