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

base: Context has to be optional in for path tok. exp.

Browse Source 
We call path token expansion functions with a NULL context in CCAPI
(lib/krb5/acache.c).  We only need the context for errors.
This commit is contained in:
Nicolas Williams
2022-01-19 23:32:22 -06:00
parent 82e00128a2
commit 1e634df8a5
1 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/base/expand_path.c
View File

@@ -59,10 +59,9 @@ expand_temp_folder(heim_context context, PTYPE param, const char *postfix,
size_t len; size_t len;
if (!GetTempPath(sizeof(tpath)/sizeof(tpath[0]), tpath)) { if (!GetTempPath(sizeof(tpath)/sizeof(tpath[0]), tpath)) {
if (context) heim_set_error_message(context, EINVAL,
heim_set_error_message(context, EINVAL, "Failed to get temporary path (GLE=%d)",
"Failed to get temporary path (GLE=%d)", GetLastError());
GetLastError());
return EINVAL; return EINVAL;
} }
@@ -170,55 +169,52 @@ expand_userid(heim_context context, PTYPE param, const char *postfix,
} }
if (le != 0) { if (le != 0) {
if (context) heim_set_error_message(context, rv,
heim_set_error_message(context, rv, "Can't open thread token (GLE=%d)", le);
"Can't open thread token (GLE=%d)", le);
goto _exit; goto _exit;
} }
} }
if (!GetTokenInformation(hToken, TokenOwner, NULL, 0, &len)) { if (!GetTokenInformation(hToken, TokenOwner, NULL, 0, &len)) {
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) { if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
if (context) heim_set_error_message(context, rv,
heim_set_error_message(context, rv, "Unexpected error reading token information (GLE=%d)",
"Unexpected error reading token information (GLE=%d)", GetLastError());
GetLastError());
goto _exit; goto _exit;
} }
if (len == 0) { if (len == 0) {
if (context) heim_set_error_message(context, rv,
heim_set_error_message(context, rv, "GetTokenInformation() returned truncated buffer");
"GetTokenInformation() returned truncated buffer");
goto _exit; goto _exit;
} }
pOwner = malloc(len); pOwner = malloc(len);
if (pOwner == NULL) { if (pOwner == NULL) {
if (context) heim_set_error_message(context, rv, "Out of memory");
heim_set_error_message(context, rv, "Out of memory");
goto _exit; goto _exit;
} }
} else { } else {
if (context) heim_set_error_message(context, rv, "GetTokenInformation() returned truncated buffer");
heim_set_error_message(context, rv, "GetTokenInformation() returned truncated buffer");
goto _exit; goto _exit;
} }
if (!GetTokenInformation(hToken, TokenOwner, pOwner, len, &len)) { if (!GetTokenInformation(hToken, TokenOwner, pOwner, len, &len)) {
if (context) heim_set_error_message(context, rv,
heim_set_error_message(context, rv, "GetTokenInformation() failed. GLE=%d", GetLastError()); "GetTokenInformation() failed. GLE=%d",
GetLastError());
goto _exit; goto _exit;
} }
if (!ConvertSidToStringSid(pOwner->Owner, &strSid)) { if (!ConvertSidToStringSid(pOwner->Owner, &strSid)) {
if (context) heim_set_error_message(context, rv,
heim_set_error_message(context, rv, "Can't convert SID to string. GLE=%d", GetLastError()); "Can't convert SID to string. GLE=%d",
GetLastError());
goto _exit; goto _exit;
} }
*ret = strdup(strSid); *ret = strdup(strSid);
if (*ret == NULL && context) if (*ret == NULL)
heim_set_error_message(context, rv, "Out of memory"); heim_set_error_message(context, rv, "Out of memory");
rv = 0; rv = 0;
@@ -248,8 +244,7 @@ expand_csidl(heim_context context, PTYPE folder, const char *postfix,
size_t len; size_t len;
if (SHGetFolderPath(NULL, folder, NULL, SHGFP_TYPE_CURRENT, path) != S_OK) { if (SHGetFolderPath(NULL, folder, NULL, SHGFP_TYPE_CURRENT, path) != S_OK) {
if (context) heim_set_error_message(context, EINVAL, "Unable to determine folder path");
heim_set_error_message(context, EINVAL, "Unable to determine folder path");
return EINVAL; return EINVAL;
} }
@@ -387,7 +382,7 @@ expand_strftime(heim_context context, PTYPE param, const char *postfix,
t = time(NULL); t = time(NULL);
len = strftime(buf, sizeof(buf), arg, localtime(&t)); len = strftime(buf, sizeof(buf), arg, localtime(&t));
if (len == 0 || len >= sizeof(buf)) if (len == 0 || len >= sizeof(buf))
return ENOMEM; return heim_enomem(context);
*ret = strdup(buf); *ret = strdup(buf);
return 0; return 0;
} }
@@ -488,8 +483,7 @@ expand_token(heim_context context,
if (token[0] != '%' || token[1] != '{' || token_end[0] != '}' || if (token[0] != '%' || token[1] != '{' || token_end[0] != '}' ||
token_end - token <= 2) { token_end - token <= 2) {
if (context) heim_set_error_message(context, EINVAL,"Invalid token.");
heim_set_error_message(context, EINVAL,"Invalid token.");
return EINVAL; return EINVAL;
} }
@@ -521,8 +515,7 @@ expand_token(heim_context context,
return errcode; return errcode;
} }
if (context) heim_set_error_message(context, EINVAL, "Invalid token.");
heim_set_error_message(context, EINVAL, "Invalid token.");
return EINVAL; return EINVAL;
} }
@@ -665,8 +658,7 @@ heim_expand_path_tokensv(heim_context context,
if (*ppath_out) if (*ppath_out)
free(*ppath_out); free(*ppath_out);
*ppath_out = NULL; *ppath_out = NULL;
if (context) heim_set_error_message(context, EINVAL, "variable missing }");
heim_set_error_message(context, EINVAL, "variable missing }");
return EINVAL; return EINVAL;
} }