luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ref the passed in socket in g_socket_listener_add_socket (#585599)

Browse Source
This commit is contained in:
Alexander Larsson 2009-06-15 15:42:38 +02:00
parent 67de6cba50
commit a640695f16
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gio/gsocketlistener.c
View File

@ -234,6 +234,7 @@ g_socket_listener_add_socket (GSocketListener *listener,
return FALSE; return FALSE;
} }
g_object_ref (socket);
g_ptr_array_add (listener->priv->sockets, socket); g_ptr_array_add (listener->priv->sockets, socket);
if (source_object) if (source_object)
@ -301,15 +302,13 @@ g_socket_listener_add_address (GSocketListener *listener,
g_socket_set_listen_backlog (socket, listener->priv->listen_backlog); g_socket_set_listen_backlog (socket, listener->priv->listen_backlog);
if (!g_socket_bind (socket, address, TRUE, error) || if (!g_socket_bind (socket, address, TRUE, error) ||
!g_socket_listen (socket, error) || !g_socket_listen (socket, error))
!g_socket_listener_add_socket (listener, socket,
source_object,
error))
{ {
g_object_unref (socket); g_object_unref (socket);
return FALSE; return FALSE;
} }
local_address = NULL;
if (effective_address) if (effective_address)
{ {
local_address = g_socket_get_local_address (socket, error); local_address = g_socket_get_local_address (socket, error);
@ -318,9 +317,23 @@ g_socket_listener_add_address (GSocketListener *listener,
g_object_unref (socket); g_object_unref (socket);
return FALSE; return FALSE;
} }
*effective_address = local_address;
} }
if (!g_socket_listener_add_socket (listener, socket,
source_object,
error))
{
if (local_address)
g_object_unref (local_address);
g_object_unref (socket);
return FALSE;
}
if (effective_address)
*effective_address = local_address;
g_object_unref (socket); /* add_socket refs this */
if (G_SOCKET_LISTENER_GET_CLASS (listener)->changed) if (G_SOCKET_LISTENER_GET_CLASS (listener)->changed)
G_SOCKET_LISTENER_GET_CLASS (listener)->changed (listener); G_SOCKET_LISTENER_GET_CLASS (listener)->changed (listener);