Commit 8e2fe8a3 authored by Philipp Schafft's avatar Philipp Schafft 🦁

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

parent 1653d748
...@@ -2277,6 +2277,10 @@ mount_proxy *config_find_mount (ice_config_t *config, ...@@ -2277,6 +2277,10 @@ mount_proxy *config_find_mount (ice_config_t *config,
{ {
mount_proxy *mountinfo = config->mounts; mount_proxy *mountinfo = config->mounts;
/* invalid args */
if (!mount && type != MOUNT_TYPE_DEFAULT)
return NULL;
for (; mountinfo; mountinfo = mountinfo->next) { for (; mountinfo; mountinfo = mountinfo->next) {
if (mountinfo->mounttype != type) if (mountinfo->mounttype != type)
continue; continue;
...@@ -2288,7 +2292,7 @@ mount_proxy *config_find_mount (ice_config_t *config, ...@@ -2288,7 +2292,7 @@ mount_proxy *config_find_mount (ice_config_t *config,
if (strcmp(mountinfo->mountname, mount) == 0) if (strcmp(mountinfo->mountname, mount) == 0)
break; break;
} else if (mountinfo->mounttype == MOUNT_TYPE_DEFAULT) { } else if (mountinfo->mounttype == MOUNT_TYPE_DEFAULT) {
if (!mountinfo->mountname) if (!mount || !mountinfo->mountname)
break; break;
#ifndef _WIN32 #ifndef _WIN32
if (fnmatch(mountinfo->mountname, mount, FNM_PATHNAME) == 0) if (fnmatch(mountinfo->mountname, mount, FNM_PATHNAME) == 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment