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

Don't make krb5_ccache point into krb5_context allocated memory

Browse Source 
Don't make a copy of the krb5_cc_ops into krb5_context and hand that
out to callers of the api, this way its possible to free a krb5_context
w/o invalidating all krb5_ccaches that was allocated using that krb5_context
(also, it saves memory)
This commit is contained in:
Love Hornquist Astrand
2009-09-01 12:22:16 -07:00
parent 20001366aa
commit 9f9783464c
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/krb5/cache.c
View File

@@ -119,8 +119,8 @@ krb5_cc_register(krb5_context context,
{ {
int i; int i;
for(i = 0; i < context->num_cc_ops && context->cc_ops[i].prefix; i++) { for(i = 0; i < context->num_cc_ops && context->cc_ops[i]->prefix; i++) {
if(strcmp(context->cc_ops[i].prefix, ops->prefix) == 0) { if(strcmp(context->cc_ops[i]->prefix, ops->prefix) == 0) {
if(!override) { if(!override) {
krb5_set_error_message(context, krb5_set_error_message(context,
KRB5_CC_TYPE_EXISTS, KRB5_CC_TYPE_EXISTS,
@@ -132,20 +132,19 @@ krb5_cc_register(krb5_context context,
} }
} }
if(i == context->num_cc_ops) { if(i == context->num_cc_ops) {
krb5_cc_ops *o = realloc(context->cc_ops, const krb5_cc_ops **o = realloc(context->cc_ops,
(context->num_cc_ops + 1) * (context->num_cc_ops + 1) *
sizeof(*context->cc_ops)); sizeof(context->cc_ops[0]));
if(o == NULL) { if(o == NULL) {
krb5_set_error_message(context, KRB5_CC_NOMEM, krb5_set_error_message(context, KRB5_CC_NOMEM,
N_("malloc: out of memory", "")); N_("malloc: out of memory", ""));
return KRB5_CC_NOMEM; return KRB5_CC_NOMEM;
} }
context->num_cc_ops++;
context->cc_ops = o; context->cc_ops = o;
memset(context->cc_ops + i, 0, context->cc_ops[context->num_cc_ops] = NULL;
(context->num_cc_ops - i) * sizeof(*context->cc_ops)); context->num_cc_ops++;
} }
memcpy(&context->cc_ops[i], ops, sizeof(context->cc_ops[i])); context->cc_ops[i] = ops;
return 0; return 0;
} }
@@ -219,12 +218,12 @@ krb5_cc_resolve(krb5_context context,
*id = NULL; *id = NULL;
for(i = 0; i < context->num_cc_ops && context->cc_ops[i].prefix; i++) { for(i = 0; i < context->num_cc_ops && context->cc_ops[i]->prefix; i++) {
size_t prefix_len = strlen(context->cc_ops[i].prefix); size_t prefix_len = strlen(context->cc_ops[i]->prefix);
if(strncmp(context->cc_ops[i].prefix, name, prefix_len) == 0 if(strncmp(context->cc_ops[i]->prefix, name, prefix_len) == 0
&& name[prefix_len] == ':') { && name[prefix_len] == ':') {
return allocate_ccache (context, &context->cc_ops[i], return allocate_ccache (context, context->cc_ops[i],
name + prefix_len + 1, name + prefix_len + 1,
id); id);
} }
@@ -970,10 +969,10 @@ krb5_cc_get_prefix_ops(krb5_context context, const char *prefix)
if (p1) if (p1)
*p1 = '\0'; *p1 = '\0';
for(i = 0; i < context->num_cc_ops && context->cc_ops[i].prefix; i++) { for(i = 0; i < context->num_cc_ops && context->cc_ops[i]->prefix; i++) {
if(strcmp(context->cc_ops[i].prefix, p) == 0) { if(strcmp(context->cc_ops[i]->prefix, p) == 0) {
free(p); free(p);
return &context->cc_ops[i]; return context->cc_ops[i];
} }
} }
free(p); free(p);
@@ -1402,7 +1401,7 @@ krb5_cccol_cursor_next(krb5_context context, krb5_cccol_cursor cursor,
if (cursor->cursor == NULL) { if (cursor->cursor == NULL) {
ret = krb5_cc_cache_get_first (context, ret = krb5_cc_cache_get_first (context,
context->cc_ops[cursor->idx].prefix, context->cc_ops[cursor->idx]->prefix,
&cursor->cursor); &cursor->cursor);
if (ret) { if (ret) {
cursor->idx++; cursor->idx++;

2
lib/krb5/krb5_locl.h
View File

@@ -234,7 +234,7 @@ typedef struct krb5_context_data {
krb5_config_section *cf; krb5_config_section *cf;
struct et_list *et_list; struct et_list *et_list;
struct krb5_log_facility *warn_dest; struct krb5_log_facility *warn_dest;
krb5_cc_ops *cc_ops; const krb5_cc_ops **cc_ops;
int num_cc_ops; int num_cc_ops;
const char *http_proxy; const char *http_proxy;
const char *time_fmt; const char *time_fmt;