ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

parser-helper: Detect absolute pathnames and concatenate paths on Windows

This commit is contained in:
Martin Willi 2014-03-04 13:59:04 +01:00
parent 67b3bcd13d
commit bc9fd3735d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libstrongswan/utils/parser_helper.c
View File

@ -140,7 +140,7 @@ METHOD(parser_helper_t, file_include, void,
return;
}
if (!file->name || pattern[0] == '/')
if (!file->name || path_absolute(pattern))
{ /* absolute path */
if (snprintf(pat, sizeof(pat), "%s", pattern) >= sizeof(pat))
{
@ -152,7 +152,8 @@ METHOD(parser_helper_t, file_include, void,
else
{ /* base relative paths to the directory of the current file */
char *dir = path_dirname(file->name);
if (snprintf(pat, sizeof(pat), "%s/%s", dir, pattern) >= sizeof(pat))
if (snprintf(pat, sizeof(pat), "%s%s%s", dir, DIRECTORY_SEPARATOR,
pattern) >= sizeof(pat))
{
PARSER_DBG1(&this->public, "include pattern too long, ignored");
free(dir);