fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-01 20:50:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed crashes accessing not initiated noncefile member struct

Browse source
This commit is contained in:
Ralf Habacker 2009-12-01 11:41:45 +01:00
parent 7c0fbba5b5
commit c0fa33dc5f
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dbus/dbus-server-socket.c
View file

@ -188,7 +188,10 @@ socket_handle_watch (DBusWatch *watch,
listen_fd = dbus_watch_get_socket (watch);
client_fd = _dbus_accept_with_noncefile (listen_fd, socket_server->noncefile);
if (socket_server->noncefile)
client_fd = _dbus_accept_with_noncefile (listen_fd, socket_server->noncefile);
else
client_fd = _dbus_accept (listen_fd);
if (client_fd < 0)
{
@ -340,8 +343,11 @@ _dbus_server_new_for_socket (int *fds,
return (DBusServer*) socket_server;
failed_3:
_dbus_noncefile_delete (socket_server->noncefile, NULL);
dbus_free (socket_server->noncefile );
if (socket_server->noncefile)
{
_dbus_noncefile_delete (socket_server->noncefile, NULL);
dbus_free (socket_server->noncefile );
}
failed_2:
for (i = 0 ; i < n_fds ; i++)
{