diff options
| author | Colin Walters <walters@verbum.org> | 2010-03-16 16:04:15 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-03-16 16:11:14 -0400 |
| commit | ebfa7c02fd67777684d39389e25346819836dcca (patch) | |
| tree | 93c2b9876ce960cbf2fa27dad9fb017184b7610b /dbus/dbus-transport-socket.c | |
| parent | acbc751e28446696fee92c236cfef176786409d5 (diff) | |
| parent | ce34415302af586ea6ca9b0da4b21a7025041ef7 (diff) | |
| download | dbus-ebfa7c02fd67777684d39389e25346819836dcca.tar.gz | |
Merge branch 'dbus-1.2'
Conflicts:
bus/bus.c
configure.in
Diffstat (limited to 'dbus/dbus-transport-socket.c')
| -rw-r--r-- | dbus/dbus-transport-socket.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c index dc9933d4..4f8c6cfc 100644 --- a/dbus/dbus-transport-socket.c +++ b/dbus/dbus-transport-socket.c @@ -1357,16 +1357,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: |