svn merge ^/branches/released .

1 files changed, 31 insertions, 15 deletions

diff --git a/libxcb/src/xcb_util.c b/libxcb/src/xcb_util.c
index a3658ec80..af163185a 100644
--- a/libxcb/src/xcb_util.c
+++ b/libxcb/src/xcb_util.c
@@ -68,6 +68,7 @@ static int _xcb_parse_display(const char *name, char **host, char **protocol,
 {

     int len, display, screen;

     char *slash, *colon, *dot, *end;

+

     if(!name || !*name)

         name = getenv("DISPLAY");

     if(!name)

@@ -96,35 +97,43 @@ static int _xcb_parse_display(const char *name, char **host, char **protocol,
 

     colon = strrchr(name, ':');

     if(!colon)

-        return 0;

+        goto error_out;

     len = colon - name;

     ++colon;

     display = strtoul(colon, &dot, 10);

     if(dot == colon)

-        return 0;

+        goto error_out;

     if(*dot == '\0')

         screen = 0;

     else

     {

         if(*dot != '.')

-            return 0;

+            goto error_out;

         ++dot;

         screen = strtoul(dot, &end, 10);

         if(end == dot || *end != '\0')

-            return 0;

+            goto error_out;

     }

     /* At this point, the display string is fully parsed and valid, but

      * the caller's memory is untouched. */

 

     *host = malloc(len + 1);

     if(!*host)

-        return 0;

+        goto error_out;

     memcpy(*host, name, len);

     (*host)[len] = '\0';

     *displayp = display;

     if(screenp)

         *screenp = screen;

     return 1;

+

+error_out:

+    if (protocol) {

+        free(*protocol);

+        *protocol = NULL;

+    }

+

+    return 0;

 }

 

 int xcb_parse_display(const char *name, char **host, int *displayp,

@@ -417,24 +426,28 @@ xcb_connection_t *xcb_connect(const char *displayname, int *screenp)
 xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname, xcb_auth_info_t *auth, int *screenp)

 {

     int fd, display = 0;

-    char *host;

-    char *protocol;

+    char *host = NULL;

+    char *protocol = NULL;

     xcb_auth_info_t ourauth;

     xcb_connection_t *c;

 

     int parsed = _xcb_parse_display(displayname, &host, &protocol, &display, screenp);

     

-    if(!parsed)

-        return (xcb_connection_t *) &error_connection;

-    else

+    if(!parsed) {

+        c = (xcb_connection_t *) &error_connection;

+        goto out;

+    } else

         fd = _xcb_open(host, protocol, display);

-    free(host);

 

-    if(fd == -1)

-        return (xcb_connection_t *) &error_connection;

+    if(fd == -1) {

+        c = (xcb_connection_t *) &error_connection;

+        goto out;

+    }

 

-    if(auth)

-        return xcb_connect_to_fd(fd, auth);

+    if(auth) {

+        c = xcb_connect_to_fd(fd, auth);

+        goto out;

+    }

 

     if(_xcb_get_auth_info(fd, &ourauth, display))

     {

@@ -445,5 +458,8 @@ xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname,
     else

         c = xcb_connect_to_fd(fd, 0);

 

+out:

+    free(host);

+    free(protocol);

     return c;

 }