diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-30 23:15:16 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-30 23:15:22 +0300 |
commit | f5c5aa968c3c96ff3968bd5b060e5a0f2f278732 (patch) | |
tree | 1100a419e271a45610e0316bf96fe6ccd486d688 /libavdevice/xcbgrab.c | |
parent | dc83733f2bf2f26433bbf23d42fe92a2c7691df1 (diff) | |
parent | e8c4db0d4d07738fed716b1d2f20c85aac944641 (diff) |
Merge commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641'
* commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641':
xcbgrab: Validate the capture area
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/xcbgrab.c')
-rw-r--r-- | libavdevice/xcbgrab.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index 2878995412..15512cd15f 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -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(); |