denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martin Willi
2014-06-04 15:53:09 +02:00
parent 67b3bcd13d
commit bc9fd3735d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/parser_helper.c
+3 -2
View File
@@ -140,7 +140,7 @@ METHOD(parser_helper_t, file_include, void,
return; return;
} }
if (!file->name || pattern[0] == '/') if (!file->name || path_absolute(pattern))
{ /* absolute path */ { /* absolute path */
if (snprintf(pat, sizeof(pat), "%s", pattern) >= sizeof(pat)) if (snprintf(pat, sizeof(pat), "%s", pattern) >= sizeof(pat))
{ {
@@ -152,7 +152,8 @@ METHOD(parser_helper_t, file_include, void,
else else
{ /* base relative paths to the directory of the current file */ { /* base relative paths to the directory of the current file */
char *dir = path_dirname(file->name); 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"); PARSER_DBG1(&this->public, "include pattern too long, ignored");
free(dir); free(dir);