1
0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00

Fix: Fixed two double-unlock errors

This commit is contained in:
Philipp Schafft 2020-02-14 14:05:01 +00:00
parent 97181fb112
commit 2ffaa92ea6
2 changed files with 3 additions and 4 deletions

View File

@ -8,7 +8,7 @@
* oddsock <oddsock@xiph.org>, * oddsock <oddsock@xiph.org>,
* Karl Heyes <karl@xiph.org> * Karl Heyes <karl@xiph.org>
* and others (see AUTHORS for details). * and others (see AUTHORS for details).
* Copyright 2011-2018, Philipp "ph3-der-loewe" Schafft <lion@lion.leolix.org>, * Copyright 2011-2020, Philipp "ph3-der-loewe" Schafft <lion@lion.leolix.org>,
*/ */
/* client.c /* client.c
@ -988,7 +988,6 @@ ssize_t client_get_baseurl(client_t *client, listensocket_t *listensocket, char
port = listener->port; port = listener->port;
if (!client) if (!client)
tlsmode = listener->tls; tlsmode = listener->tls;
listensocket_release_listener(listensocket);
} }
} }

View File

@ -3,7 +3,7 @@
* This program is distributed under the GNU General Public License, version 2. * This program is distributed under the GNU General Public License, version 2.
* A copy of this license is included with this source. * A copy of this license is included with this source.
* *
* Copyright 2018, Philipp "ph3-der-loewe" Schafft <lion@lion.leolix.org>, * Copyright 2018-2020, Philipp "ph3-der-loewe" Schafft <lion@lion.leolix.org>,
*/ */
/** /**
@ -494,8 +494,8 @@ static listensocket_t * listensocket_container_get_by_id(listensocket_container_
listener = listensocket_get_listener(self->sock[i]); listener = listensocket_get_listener(self->sock[i]);
if (listener) { if (listener) {
if (listener->id != NULL && strcmp(listener->id, id) == 0) { if (listener->id != NULL && strcmp(listener->id, id) == 0) {
listensocket_release_listener(self->sock[i]);
if (refobject_ref(self->sock[i]) == 0) { if (refobject_ref(self->sock[i]) == 0) {
listensocket_release_listener(self->sock[i]);
return self->sock[i]; return self->sock[i];
} }
} }