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

(krb5_ret_principal): fix memory leak

Browse Source 
Coverity, NetBSD CID#1695


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17018 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-07 22:23:20 +00:00
parent 8a99a492b5
commit 4466bd867f
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/krb5/store.c
View File

@@ -420,7 +420,7 @@ krb5_ret_principal(krb5_storage *sp,
if(krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_NO_NAME_TYPE)) if(krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_NO_NAME_TYPE))
type = KRB5_NT_UNKNOWN; type = KRB5_NT_UNKNOWN;
else if((ret = krb5_ret_int32(sp, &type))){ else if((ret = krb5_ret_int32(sp, &type))){
free(p); free(p);
return ret; return ret;
} }
@@ -430,18 +430,31 @@ krb5_ret_principal(krb5_storage *sp,
} }
if(krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_WRONG_NUM_COMPONENTS)) if(krb5_storage_is_flags(sp, KRB5_STORAGE_PRINCIPAL_WRONG_NUM_COMPONENTS))
ncomp--; ncomp--;
if (ncomp < 0) {
free(p);
return EINVAL;
}
p->name.name_type = type; p->name.name_type = type;
p->name.name_string.len = ncomp; p->name.name_string.len = ncomp;
ret = krb5_ret_string(sp, &p->realm); ret = krb5_ret_string(sp, &p->realm);
if(ret) return ret; if(ret) {
free(p);
return ret;
}
p->name.name_string.val = calloc(ncomp, sizeof(*p->name.name_string.val)); p->name.name_string.val = calloc(ncomp, sizeof(*p->name.name_string.val));
if(p->name.name_string.val == NULL){ if(p->name.name_string.val == NULL && ncomp != 0){
free(p->realm); free(p->realm);
return ENOMEM; return ENOMEM;
} }
for(i = 0; i < ncomp; i++){ for(i = 0; i < ncomp; i++){
ret = krb5_ret_string(sp, &p->name.name_string.val[i]); ret = krb5_ret_string(sp, &p->name.name_string.val[i]);
if(ret) return ret; /* XXX */ if(ret) {
while (i >= 0)
free(p->name.name_string.val[i--]);
free(p->realm);
free(p);
return ret;
}
} }
*princ = p; *princ = p;
return 0; return 0;