motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 02:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
-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>
This commit is contained in:
Marc-André Lureau 2023-03-20 17:36:43 +04:00
parent e40283d9a1
commit 74bc00c6b9
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ui/dbus.c
View file

@ -304,11 +304,20 @@ dbus_display_add_client(int csock, Error **errp)
g_cancellable_cancel(dbus_display->add_client_cancellable); 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); socket = g_socket_new_from_fd(csock, &err);
#endif
if (!socket) { if (!socket) {
error_setg(errp, "Failed to setup D-Bus socket: %s", err->message); error_setg(errp, "Failed to setup D-Bus socket: %s", err->message);
close(csock);
return false; 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); conn = g_socket_connection_factory_create_connection(socket);