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

Fix: Handle mount=NULL in config_find_mount() correctly.

Browse Source
This commit is contained in:
Philipp Schafft 2015-11-11 12:18:15 +00:00
parent 1653d7489a
commit 8e2fe8a3f7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cfgfile.c
View File

@ -2277,6 +2277,10 @@ mount_proxy *config_find_mount (ice_config_t *config,
{
mount_proxy *mountinfo = config->mounts;
/* invalid args */
if (!mount && type != MOUNT_TYPE_DEFAULT)
return NULL;
for (; mountinfo; mountinfo = mountinfo->next) {
if (mountinfo->mounttype != type)
continue;
@ -2288,7 +2292,7 @@ mount_proxy *config_find_mount (ice_config_t *config,
if (strcmp(mountinfo->mountname, mount) == 0)
break;
} else if (mountinfo->mounttype == MOUNT_TYPE_DEFAULT) {
if (!mountinfo->mountname)
if (!mount || !mountinfo->mountname)
break;
#ifndef _WIN32
if (fnmatch(mountinfo->mountname, mount, FNM_PATHNAME) == 0)