From: Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
Date: Mon, 15 Mar 2010 14:39:45 +0000 (+0100)
Subject: Fix double-free in error case.
X-Git-Tag: dbus-1.2.22~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c657579a0545af63b0286c3c901f7812149f6dc;p=thirdparty%2Fdbus.git

Fix double-free in error case.

Signed-off-by: Thiago Macieira <thiago@kde.org>
---

diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c
index 8be4d1355..05d7d91fd 100644
--- a/dbus/dbus-transport-socket.c
+++ b/dbus/dbus-transport-socket.c
@@ -1288,16 +1288,14 @@ _dbus_transport_new_for_tcp_socket (const char     *host,
                  host, port);
   
   transport = _dbus_transport_new_for_socket (fd, NULL, &address);
+  _dbus_string_free (&address);
   if (transport == NULL)
     {
       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
       _dbus_close_socket (fd, NULL);
-      _dbus_string_free (&address);
       fd = -1;
     }
 
-  _dbus_string_free (&address);
-  
   return transport;
 
 error: