har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'

Browse Source 
* commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788':
  xcbgrab: Move NULL check before pointer dereference

Conflicts:
	libavdevice/xcbgrab.c

See: e86df0206f06b8d1e97e2b60db8f74a398d53127
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-19 05:13:59 +01:00
commit c054cff87a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavdevice/xcbgrab.c
View File

@ -106,14 +106,13 @@ static int xcbgrab_reposition(AVFormatContext *s,
xcb_get_geometry_reply_t *geo) xcb_get_geometry_reply_t *geo)
{ {
XCBGrabContext *c = s->priv_data; XCBGrabContext *c = s->priv_data;
int x, y, p_x, p_y; int x = c->x, y = c->y;
int w = c->width, h = c->height, f = c->follow_mouse; int w = c->width, h = c->height, f = c->follow_mouse;
int p_x, p_y;
if (!p || !geo) if (!p || !geo)
return AVERROR(EIO); return AVERROR(EIO);
x = c->x;
y = c->y;
p_x = p->win_x; p_x = p->win_x;
p_y = p->win_y; p_y = p->win_y;