From 9e06327ecb8f73c7904d10af7ad339c57cdaa788 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Wed, 17 Dec 2014 15:19:41 +0100
Subject: [PATCH] xcbgrab: Move NULL check before pointer dereference
Bug-Id: CID 1254668
---
libavdevice/xcbgrab.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c
index 243ece4b1d0..161bd032817 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;
--
GitLab