mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

shm: call close() after shutdown()

Browse source 
shutdown() doesn't close the file descriptor so we leak sockets if we
don't call close().

https://bugzilla.gnome.org/show_bug.cgi?id=724077
This commit is contained in:
Aleix Conchillo Flaqué 2014-02-10 15:38:08 -08:00 committed by Olivier Crête
parent f5a1ccd0de
commit fd27bdf5f0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/shm/shmpipe.c
View file

@ -428,8 +428,10 @@ void
sp_writer_close (ShmPipe * self, sp_buffer_free_callback callback, sp_writer_close (ShmPipe * self, sp_buffer_free_callback callback,
void *user_data) void *user_data)
{ {
if (self->main_socket >= 0) if (self->main_socket >= 0) {
shutdown (self->main_socket, SHUT_RDWR); shutdown (self->main_socket, SHUT_RDWR);
close (self->main_socket);
}
if (self->socket_path) { if (self->socket_path) {
unlink (self->socket_path); unlink (self->socket_path);
@ -841,6 +843,7 @@ sp_writer_accept_client (ShmPipe * self)
error: error:
shutdown (fd, SHUT_RDWR); shutdown (fd, SHUT_RDWR);
close (fd);
return NULL; return NULL;
} }
@ -893,6 +896,7 @@ sp_writer_close_client (ShmPipe * self, ShmClient * client,
ShmClient *item = NULL, *prev_item = NULL; ShmClient *item = NULL, *prev_item = NULL;
shutdown (client->fd, SHUT_RDWR); shutdown (client->fd, SHUT_RDWR);
close (client->fd);
again: again:
for (buffer = self->buffers; buffer; buffer = buffer->next) { for (buffer = self->buffers; buffer; buffer = buffer->next) {