[FFmpeg-cvslog] xcbgrab: Move NULL check before pointer dereference

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Dec 17 15:19:41 2014 +0100| [9e06327ecb8f73c7904d10af7ad339c57cdaa788] | committer: Vittorio Giovara

xcbgrab: Move NULL check before pointer dereference

Bug-Id: CID 1254668

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e06327ecb8f73c7904d10af7ad339c57cdaa788
---

 libavdevice/xcbgrab.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c
index 243ece4..161bd03 100644
--- a/libavdevice/xcbgrab.c
+++ b/libavdevice/xcbgrab.c
@@ -99,12 +99,16 @@ 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 = c->x, y = c->y;
     int w = c->width, h = c->height, f = c->follow_mouse;
+    int p_x, p_y;
 
     if (!p || !geo)
         return AVERROR(EIO);
 
+    p_x = p->win_x;
+    p_y = p->win_y;
+
     if (f == FOLLOW_CENTER) {
         x = p_x - w / 2;
         y = p_y - h / 2;