summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>2010-03-15 15:39:45 +0100
committerThiago Macieira <thiago@kde.org>2010-03-15 17:08:40 +0100
commit3c657579a0545af63b0286c3c901f7812149f6dc (patch)
tree45813289f1ee9a58bdc0b8e7b64706eaac5ed068
parentf4da942cb410723a099c8086c53e20a46b14eb4a (diff)
downloaddbus-3c657579a0545af63b0286c3c901f7812149f6dc.tar.gz
Fix double-free in error case.
Signed-off-by: Thiago Macieira <thiago@kde.org>
-rw-r--r--dbus/dbus-transport-socket.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c
index 8be4d135..05d7d91f 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: