From 8491640b54eb83d1c06f1fc66475ce98b6e355cc Mon Sep 17 00:00:00 2001 From: Jon Lund Steffensen Date: Wed, 18 Aug 2010 20:38:02 +0200 Subject: gamma-randr.c: Apparently error and ver_reply can both be NULL. Check both to avoid seg faults. --- src/gamma-randr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/gamma-randr.c') diff --git a/src/gamma-randr.c b/src/gamma-randr.c index 66d5c48..be8bdd9 100644 --- a/src/gamma-randr.c +++ b/src/gamma-randr.c @@ -62,9 +62,12 @@ randr_init(randr_state_t *state) xcb_randr_query_version_reply_t *ver_reply = xcb_randr_query_version_reply(state->conn, ver_cookie, &error); - if (error) { + /* TODO What does it mean when both error and ver_reply is NULL? + Apparently, we have to check both to avoid seg faults. */ + if (error || ver_reply == NULL) { + int ec = (error != 0) ? error->error_code : -1; fprintf(stderr, _("`%s' returned error %d\n"), - "RANDR Query Version", error->error_code); + "RANDR Query Version", ec); xcb_disconnect(state->conn); return -1; } -- cgit v1.2.3-70-g09d2