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

Switch to krb5_enomem

Browse Source
This commit is contained in:
Love Hornquist Astrand
2011-05-22 20:43:31 -07:00
parent 5829bfe476
commit 8b1b47035d
1 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
lib/krb5/transited.c
View File

@@ -84,20 +84,15 @@ make_path(krb5_context context, struct tr_realm *r,
if(strcmp(p, to) == 0) if(strcmp(p, to) == 0)
break; break;
tmp = calloc(1, sizeof(*tmp)); tmp = calloc(1, sizeof(*tmp));
if(tmp == NULL){ if(tmp == NULL)
krb5_set_error_message(context, ENOMEM, return krb5_enomem(context);
N_("malloc: out of memory", ""));
return ENOMEM;
}
tmp->next = r->next; tmp->next = r->next;
r->next = tmp; r->next = tmp;
tmp->realm = strdup(p); tmp->realm = strdup(p);
if(tmp->realm == NULL){ if(tmp->realm == NULL){
r->next = tmp->next; r->next = tmp->next;
free(tmp); free(tmp);
krb5_set_error_message(context, ENOMEM, return krb5_enomem(context);
N_("malloc: out of memory", ""));
return ENOMEM;;
} }
} }
}else if(strncmp(from, to, strlen(to)) == 0){ }else if(strncmp(from, to, strlen(to)) == 0){
@@ -110,20 +105,15 @@ make_path(krb5_context context, struct tr_realm *r,
if(strncmp(to, from, p - from) == 0) if(strncmp(to, from, p - from) == 0)
break; break;
tmp = calloc(1, sizeof(*tmp)); tmp = calloc(1, sizeof(*tmp));
if(tmp == NULL){ if(tmp == NULL)
krb5_set_error_message(context, ENOMEM, return krb5_enomem(context);
N_("malloc: out of memory", ""));
return ENOMEM;
}
tmp->next = r->next; tmp->next = r->next;
r->next = tmp; r->next = tmp;
tmp->realm = malloc(p - from + 1); tmp->realm = malloc(p - from + 1);
if(tmp->realm == NULL){ if(tmp->realm == NULL){
r->next = tmp->next; r->next = tmp->next;
free(tmp); free(tmp);
krb5_set_error_message(context, ENOMEM, return krb5_enomem(context);
N_("malloc: out of memory", ""));
return ENOMEM;
} }
memcpy(tmp->realm, from, p - from); memcpy(tmp->realm, from, p - from);
tmp->realm[p - from] = '\0'; tmp->realm[p - from] = '\0';
@@ -187,9 +177,7 @@ expand_realms(krb5_context context,
tmp = realloc(r->realm, len); tmp = realloc(r->realm, len);
if(tmp == NULL){ if(tmp == NULL){
free_realms(realms); free_realms(realms);
krb5_set_error_message(context, ENOMEM, return krb5_enomem(context);
N_("malloc: out of memory", ""));
return ENOMEM;
} }
r->realm = tmp; r->realm = tmp;
strlcat(r->realm, prev_realm, len); strlcat(r->realm, prev_realm, len);
@@ -202,9 +190,7 @@ expand_realms(krb5_context context,
tmp = malloc(len); tmp = malloc(len);
if(tmp == NULL){ if(tmp == NULL){
free_realms(realms); free_realms(realms);
krb5_set_error_message(context, ENOMEM, return krb5_enomem(context);
N_("malloc: out of memory", ""));
return ENOMEM;
} }
strlcpy(tmp, prev_realm, len); strlcpy(tmp, prev_realm, len);
strlcat(tmp, r->realm, len); strlcat(tmp, r->realm, len);
@@ -288,19 +274,14 @@ decode_realms(krb5_context context,
} }
if(tr[i] == ','){ if(tr[i] == ','){
tmp = malloc(tr + i - start + 1); tmp = malloc(tr + i - start + 1);
if(tmp == NULL){ if(tmp == NULL)
krb5_set_error_message(context, ENOMEM, return krb5_enomem(context);
N_("malloc: out of memory", ""));
return ENOMEM;
}
memcpy(tmp, start, tr + i - start); memcpy(tmp, start, tr + i - start);
tmp[tr + i - start] = '\0'; tmp[tr + i - start] = '\0';
r = make_realm(tmp); r = make_realm(tmp);
if(r == NULL){ if(r == NULL){
free_realms(*realms); free_realms(*realms);
krb5_set_error_message(context, ENOMEM, return krb5_enomem(context);
N_("malloc: out of memory", ""));
return ENOMEM;
} }
*realms = append_realm(*realms, r); *realms = append_realm(*realms, r);
start = tr + i + 1; start = tr + i + 1;
@@ -309,18 +290,14 @@ decode_realms(krb5_context context,
tmp = malloc(tr + i - start + 1); tmp = malloc(tr + i - start + 1);
if(tmp == NULL){ if(tmp == NULL){
free(*realms); free(*realms);
krb5_set_error_message(context, ENOMEM, return krb5_enomem(context);
N_("malloc: out of memory", ""));
return ENOMEM;
} }
memcpy(tmp, start, tr + i - start); memcpy(tmp, start, tr + i - start);
tmp[tr + i - start] = '\0'; tmp[tr + i - start] = '\0';
r = make_realm(tmp); r = make_realm(tmp);
if(r == NULL){ if(r == NULL){
free_realms(*realms); free_realms(*realms);
krb5_set_error_message(context, ENOMEM, return krb5_enomem(context);
N_("malloc: out of memory", ""));
return ENOMEM;
} }
*realms = append_realm(*realms, r); *realms = append_realm(*realms, r);
@@ -377,7 +354,7 @@ krb5_domain_x500_decode(krb5_context context,
char **R; char **R;
R = malloc((*num_realms + 1) * sizeof(*R)); R = malloc((*num_realms + 1) * sizeof(*R));
if (R == NULL) if (R == NULL)
return ENOMEM; return krb5_enomem(context);
*realms = R; *realms = R;
while(r){ while(r){
*R++ = r->realm; *R++ = r->realm;