diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2010-08-18 20:38:02 +0200 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2010-08-18 20:38:02 +0200 |
| commit | 8491640b54eb83d1c06f1fc66475ce98b6e355cc (patch) | |
| tree | ae97ee79d0c964420f9a41b94c3704ae916d14b2 /src/gamma-randr.c | |
| parent | Switch to ubuntu-mono-dark icons that comply with the color policy (no red for non-emergency icons). (diff) | |
| download | redshift-ng-8491640b54eb83d1c06f1fc66475ce98b6e355cc.tar.gz redshift-ng-8491640b54eb83d1c06f1fc66475ce98b6e355cc.tar.bz2 redshift-ng-8491640b54eb83d1c06f1fc66475ce98b6e355cc.tar.xz | |
gamma-randr.c: Apparently error and ver_reply can both be NULL. Check both to
avoid seg faults.
Diffstat (limited to 'src/gamma-randr.c')
| -rw-r--r-- | src/gamma-randr.c | 7 |
1 files changed, 5 insertions, 2 deletions
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; } |