From: Sviatoslav Chagaev <sviatoslav.chagaev@gmail.com>
Date: Fri, 13 Sep 2013 15:54:27 +0000 (+0300)
Subject: Fix a NULL dereference on an error code path.
X-Git-Tag: dbus-1.6.16~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01a0bba9f76f125ba3616e8ddb131a127b863273;p=thirdparty%2Fdbus.git

Fix a NULL dereference on an error code path.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69327
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c
index ae4b602e8..3209cebae 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);