From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon, 20 Mar 2023 13:36:43 +0000 (+0400)
Subject: ui/dbus: fix passing SOCKET to GSocket API & leak
X-Git-Tag: pull-xen-20230323~4^2~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=74bc00c6b9065e34f04000a06c89cd04a814a599;p=people%2Faperard%2Fqemu-dm.git

ui/dbus: fix passing SOCKET to GSocket API & leak

-display dbus is not currently available to win32 users, so it's not
considered a regression.

Note also the close() leak fix in case of error.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230320133643.1618437-4-marcandre.lureau@redhat.com>
---

diff --git a/ui/dbus.c b/ui/dbus.c
index 0513de9918..b9e9698503 100644
--- a/ui/dbus.c
+++ b/ui/dbus.c
@@ -304,11 +304,20 @@ dbus_display_add_client(int csock, Error **errp)
         g_cancellable_cancel(dbus_display->add_client_cancellable);
     }
 
+#ifdef WIN32
+    socket = g_socket_new_from_fd(_get_osfhandle(csock), &err);
+#else
     socket = g_socket_new_from_fd(csock, &err);
+#endif
     if (!socket) {
         error_setg(errp, "Failed to setup D-Bus socket: %s", err->message);
+        close(csock);
         return false;
     }
+#ifdef WIN32
+    /* socket owns the SOCKET handle now, so release our osf handle */
+    qemu_close_socket_osfhandle(csock);
+#endif
 
     conn = g_socket_connection_factory_create_connection(socket);