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

plug a memory leak, don't use strcpy/strcat

Browse Source
This commit is contained in:
Love Hornquist Astrand
2013-05-01 13:55:21 -07:00
parent 0ff637618e
commit dfaedb7847
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/krb5/principal.c
View File

@@ -1730,7 +1730,7 @@ _krb5_apply_name_canon_rule(krb5_context context, krb5_name_canon_rule rule,
char *realm = NULL; char *realm = NULL;
const char *sname = NULL; const char *sname = NULL;
const char *hostname = NULL; const char *hostname = NULL;
char *new_hostname; char *new_hostname = NULL;
const char *cp; const char *cp;
heim_assert(in_princ->name.name_type == KRB5_NT_SRV_HST_NEEDS_CANON, heim_assert(in_princ->name.name_type == KRB5_NT_SRV_HST_NEEDS_CANON,
@@ -1800,16 +1800,13 @@ _krb5_apply_name_canon_rule(krb5_context context, krb5_name_canon_rule rule,
} else { } else {
size_t len; size_t len;
len = strlen(hostname) + strlen(rule->domain) + 2; asprintf(&new_hostname, "%s%s%s", hostname,
if ((new_hostname = malloc(len)) == NULL) { rule->domain[0] != '.' ? "." : "",
rule->domain);
if (new_hostname == NULL) {
ret = krb5_enomem(context); ret = krb5_enomem(context);
goto out; goto out;
} }
/* We use strcpy() and strcat() for portability for now */
strcpy(new_hostname, hostname);
if (rule->domain[0] != '.')
strcat(new_hostname, ".");
strcat(new_hostname, rule->domain);
} }
realm = rule->realm; realm = rule->realm;
if (!realm) { if (!realm) {
@@ -1870,6 +1867,8 @@ out:
} else { } else {
_krb5_debug(context, 5, "Name canon rule application error: %d", ret); _krb5_debug(context, 5, "Name canon rule application error: %d", ret);
} }
if (new_hostname)
free(new_hostname);
if (realm != rule->realm) if (realm != rule->realm)
free(realm); free(realm);
if (*out_princ) if (*out_princ)