Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
Icecast-Server
Commits
8e2fe8a3
Commit
8e2fe8a3
authored
Nov 11, 2015
by
Philipp Schafft
🦁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Handle mount=NULL in config_find_mount() correctly.
parent
1653d748
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
src/cfgfile.c
src/cfgfile.c
+5
-1
No files found.
src/cfgfile.c
View file @
8e2fe8a3
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment