ffmpeg | branch: release/2.6 | Luca Barbato <lu_z...@gentoo.org> | Sat Mar 14 12:30:11 2015 +0100| [9ccaeff67a3b0f75f7f25c39c5d373b560dcfb19] | committer: Michael Niedermayer
xcbgrab: Validate the capture area And notify why the capture is impossible. Signed-off-by: Luca Barbato <lu_z...@gentoo.org> (cherry picked from commit e8c4db0d4d07738fed716b1d2f20c85aac944641) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ccaeff67a3b0f75f7f25c39c5d373b560dcfb19 --- libavdevice/xcbgrab.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index c141c36..ab3a11e 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -532,8 +532,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(); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
