diff options
| author | Colin Guthrie <cguthrie@mandriva.org> | 2010-09-18 10:35:38 +0100 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2010-09-18 12:05:19 +0100 |
| commit | 24014e779c889caf43bf9e9c29d645e505127743 (patch) | |
| tree | daba2701a334aad2cced248e2a4a065de02ac808 | |
| parent | 38778117f8e03f32ec5af8684a1013cc7807d66d (diff) | |
xcb: Ensure the XCB connection is valid before using it.
| -rw-r--r-- | src/pulse/client-conf-x11.c | 5 | ||||
| -rw-r--r-- | src/utils/pax11publish.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/pulse/client-conf-x11.c b/src/pulse/client-conf-x11.c index 565f997d9..0348a2fd4 100644 --- a/src/pulse/client-conf-x11.c +++ b/src/pulse/client-conf-x11.c @@ -55,6 +55,11 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) { goto finish; } + if (xcb_connection_has_error(xcb)) { + pa_log(_("xcb_connection_has_error() returned true")); + goto finish; + } + if (pa_x11_get_prop(xcb, "PULSE_SERVER", t, sizeof(t))) { pa_bool_t disable_autospawn = TRUE; diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c index 111bee239..62b798c5a 100644 --- a/src/utils/pax11publish.c +++ b/src/utils/pax11publish.c @@ -100,6 +100,11 @@ int main(int argc, char *argv[]) { goto finish; } + if (xcb_connection_has_error(xcb)) { + pa_log(_("xcb_connection_has_error() returned true")); + goto finish; + } + switch (mode) { case DUMP: { char t[1024]; |