From 69adfec7e6f9aae8ab0be60f2c8023d6f289165d Mon Sep 17 00:00:00 2001 From: Sviatoslav Chagaev Date: Fri, 13 Sep 2013 18:54:27 +0300 Subject: [PATCH 2/3] Fix a NULL dereference on an error code path. --- dbus/dbus-server-socket.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c index ae4b602..3209ceb 100644 --- a/dbus/dbus-server-socket.c +++ b/dbus/dbus-server-socket.c @@ -478,7 +478,10 @@ _dbus_server_new_for_tcp_socket (const char *host, if (server == NULL) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); - goto failed_4; + if (noncefile != NULL) + goto failed_4; + else + goto failed_2; } _dbus_string_free (&port_str); -- 1.8.3.1