oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

ISPATHSEP and ISTILDE macros; Windows portability

Browse Source 
Windows treats '\\' and '/' equivalently but we cannot control
the form that will be used by end users.  Introduce ISPATHSEP()
macro which tests only for '/' on UNIX and both on Windows.
Introduce ISTILDE() macro to test for '~'.   When testing for
'/' with strchr() or strrchr() add conditional checks for '\\' on
Windows.

Change-Id: Ia85e698fc88f15a6a71db649db5417f02ef7e5fe
This commit is contained in:
Jeffrey Altman
2013-09-10 21:57:07 -04:00
parent 800da1a501
commit 31a00d6647
8 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/krb5/dcache.c
View File

@@ -256,8 +256,8 @@ dcc_resolve(krb5_context context, krb5_ccache *id, const char *res)
p = res;
do {
p = strstr(p, "/..");
if (p && (p[3] == '/' || p[3] == '\0')) {
p = strstr(p, "..");
if (p && (p == res || ISPATHSEP(p[-1])) && (ISPATHSEP(p[2]) || p[2] == '\0')) {
krb5_set_error_message(context, KRB5_CC_FORMAT,
N_("Path contains a .. component", ""));
return KRB5_CC_FORMAT;
@@ -278,6 +278,10 @@ dcc_resolve(krb5_context context, krb5_ccache *id, const char *res)
char *q;
dc->dir = strdup(&res[1]);
#ifdef _WIN32
q = strrchr(dc->dir, '\\');
if (q == NULL)
#endif
q = strrchr(dc->dir, '/');
if (q) {
*q++ = '\0';
@@ -318,7 +322,7 @@ dcc_resolve(krb5_context context, krb5_ccache *id, const char *res)
len = strlen(dc->dir);
if (dc->dir[len - 1] == '/')
if (ISPATHSEP(dc->dir[len - 1]))
dc->dir[len - 1] = '\0';
ret = verify_directory(context, dc->dir);