Browse Source

avdevice/xcbgrab: check xcb_query_pointer_reply_t pointer before use

Fixes CID1254668

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.6
Michael Niedermayer 11 years ago
parent
commit
e86df0206f
1 changed files with 6 additions and 1 deletions
  1. +6
    -1
      libavdevice/xcbgrab.c

+ 6
- 1
libavdevice/xcbgrab.c View File

@@ -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;


Loading…
Cancel
Save