From: Uli Schlachter <psychon@znc.in>
Date: Tue, 31 Dec 2013 14:18:01 +0000 (+0100)
Subject: Make xcb_disconnect(NULL) safe
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?p=free-sw%2Fxcb%2Flibxcb;a=commitdiff_plain;h=2fb14e5883f2ea2f01d248674cfcc26ccb704753;hp=4dcbfd77b78ca6b016ce815af26235501f6cd75a

Make xcb_disconnect(NULL) safe

Code can be simplified if the deallocation functions can always be called in
cleanup code. So if you have some code that does several things that can go
wrong, one of which is xcb_connect(), after this change, the xcb_connection_t*
variable can be initialized to NULL and xcb_disconnect() can always be called on
the connection object.

References: http://lists.freedesktop.org/archives/xcb/2013-September/008659.html

Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Julien Cristau <jcristau@debian.org>
---

diff --git a/src/xcb.h b/src/xcb.h
index 148b00c..c17a2ef 100644
--- a/src/xcb.h
+++ b/src/xcb.h
@@ -483,7 +483,7 @@ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info);
  * @param c: The connection.
  *
  * Closes the file descriptor and frees all memory associated with the
- * connection @c c.
+ * connection @c c. If @p c is @c NULL, nothing is done.
  */
 void xcb_disconnect(xcb_connection_t *c);
 
diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index ab901a9..fa50985 100644
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -350,7 +350,7 @@ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info)
 
 void xcb_disconnect(xcb_connection_t *c)
 {
-    if(is_static_error_conn(c))
+    if(c == NULL || is_static_error_conn(c))
         return;
 
     free(c->setup);