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

stroke: Use thread-safe dirname(3)

Browse Source
This commit is contained in:
Tobias Brunner
2014-02-24 12:04:11 +01:00
parent 18019a3b89
commit 849e401b37
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_cred.c
+4 -6
View File
@@ -17,7 +17,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <limits.h> #include <limits.h>
#include <libgen.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
@@ -1130,7 +1129,7 @@ static void load_secrets(private_stroke_cred_t *this, mem_cred_t *secrets,
} }
if (line.len > strlen("include ") && strpfx(line.ptr, "include ")) if (line.len > strlen("include ") && strpfx(line.ptr, "include "))
{ {
char **expanded, *path, *dir, pattern[PATH_MAX]; char **expanded, *dir, pattern[PATH_MAX];
u_char *pos; u_char *pos;
if (level > MAX_SECRETS_RECURSION) if (level > MAX_SECRETS_RECURSION)
@@ -1158,18 +1157,17 @@ static void load_secrets(private_stroke_cred_t *this, mem_cred_t *secrets,
} }
else else
{ /* use directory of current file if relative */ { /* use directory of current file if relative */
path = strdup(file); dir = path_dirname(file);
dir = dirname(path);
if (line.len + 1 + strlen(dir) + 1 > sizeof(pattern)) if (line.len + 1 + strlen(dir) + 1 > sizeof(pattern))
{ {
DBG1(DBG_CFG, "include pattern too long, ignored"); DBG1(DBG_CFG, "include pattern too long, ignored");
free(path); free(dir);
continue; continue;
} }
snprintf(pattern, sizeof(pattern), "%s/%.*s", snprintf(pattern, sizeof(pattern), "%s/%.*s",
dir, (int)line.len, line.ptr); dir, (int)line.len, line.ptr);
free(path); free(dir);
} }
#ifdef HAVE_GLOB_H #ifdef HAVE_GLOB_H
{ {