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

(krb5_kt_ret_principal): plug a memory leak

Browse Source 
Coverity NetBSD CID#1890


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17013 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-07 21:57:31 +00:00
parent 5800a9f897
commit 5a761c7f96
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/krb5/keytab_file.c
View File

@@ -164,7 +164,7 @@ krb5_kt_ret_principal(krb5_context context,
int i; int i;
int ret; int ret;
krb5_principal p; krb5_principal p;
int16_t tmp; int16_t len;
ALLOC(p, 1); ALLOC(p, 1);
if(p == NULL) { if(p == NULL) {
@@ -172,25 +172,34 @@ krb5_kt_ret_principal(krb5_context context,
return ENOMEM; return ENOMEM;
} }
ret = krb5_ret_int16(sp, &tmp); ret = krb5_ret_int16(sp, &len);
if(ret) if(ret) {
return ret; krb5_set_error_string(context,
"Failed decoding length of keytab principal");
goto out;
}
if(krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_WRONG_NUM_COMPONENTS)) if(krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_WRONG_NUM_COMPONENTS))
tmp--; len--;
p->name.name_string.len = tmp; if (len < 0) {
krb5_set_error_string(context,
"Keytab principal contains invalid length");
ret = KRB5_KT_END;
goto out;
}
ret = krb5_kt_ret_string(context, sp, &p->realm); ret = krb5_kt_ret_string(context, sp, &p->realm);
if(ret) if(ret)
return ret; goto out;
p->name.name_string.val = calloc(p->name.name_string.len, p->name.name_string.val = calloc(len, sizeof(*p->name.name_string.val));
sizeof(*p->name.name_string.val));
if(p->name.name_string.val == NULL) { if(p->name.name_string.val == NULL) {
krb5_set_error_string (context, "malloc: out of memory"); krb5_set_error_string (context, "malloc: out of memory");
return ENOMEM; ret = ENOMEM;
goto out;
} }
p->name.name_string.len = len;
for(i = 0; i < p->name.name_string.len; i++){ for(i = 0; i < p->name.name_string.len; i++){
ret = krb5_kt_ret_string(context, sp, p->name.name_string.val + i); ret = krb5_kt_ret_string(context, sp, p->name.name_string.val + i);
if(ret) if(ret)
return ret; goto out;
} }
if (krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_NO_NAME_TYPE)) if (krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_NO_NAME_TYPE))
p->name.name_type = KRB5_NT_UNKNOWN; p->name.name_type = KRB5_NT_UNKNOWN;
@@ -199,10 +208,13 @@ krb5_kt_ret_principal(krb5_context context,
ret = krb5_ret_int32(sp, &tmp32); ret = krb5_ret_int32(sp, &tmp32);
p->name.name_type = tmp32; p->name.name_type = tmp32;
if (ret) if (ret)
return ret; goto out;
} }
*princ = p; *princ = p;
return 0; return 0;
out:
krb5_free_principal(context, p);
return ret;
} }
static krb5_error_code static krb5_error_code