ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Dec 9 01:54:51 2014 +0100| [e86df0206f06b8d1e97e2b60db8f74a398d53127] | committer: Michael Niedermayer
avdevice/xcbgrab: check xcb_query_pointer_reply_t pointer before use Fixes CID1254668 Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e86df0206f06b8d1e97e2b60db8f74a398d53127 --- libavdevice/xcbgrab.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index f2b9135..ca85186 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -106,12 +106,17 @@ static int xcbgrab_reposition(AVFormatContext *s, xcb_get_geometry_reply_t *geo) { XCBGrabContext *c = s->priv_data; - int x = c->x, y = c->y, p_x = p->win_x, p_y = p->win_y; + int x, y, p_x, p_y; int w = c->width, h = c->height, f = c->follow_mouse; if (!p || !geo) return AVERROR(EIO); + x = c->x; + y = c->y; + p_x = p->win_x; + p_y = p->win_y; + if (f == FOLLOW_CENTER) { x = p_x - w / 2; y = p_y - h / 2; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
