diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-07-11 20:39:51 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-07-11 20:39:51 -0400 |
| commit | 443ce5fef316e3dc324fe84557a06b069dbe33f9 (patch) | |
| tree | 1aa5e33e71690fdbd4d3f7dc36ea3de8b82869df /src/kdc | |
| parent | 90f9f6f6708baff4de2162c5eb754bb4bc557845 (diff) | |
Use k5calloc instead of k5alloc where appropriate
Wherever we use k5alloc with a multiplication in the size parameter,,
use the new k5calloc helper function instead.
Diffstat (limited to 'src/kdc')
| -rw-r--r-- | src/kdc/kdc_authdata.c | 6 | ||||
| -rw-r--r-- | src/kdc/kdc_preauth.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/kdc/kdc_authdata.c b/src/kdc/kdc_authdata.c index 5a50a4762..c029892f2 100644 --- a/src/kdc/kdc_authdata.c +++ b/src/kdc/kdc_authdata.c @@ -811,7 +811,7 @@ make_ad_signedpath_data(krb5_context context, i = 0; if (i != 0) { - sign_authdata = k5alloc((i + 1) * sizeof(krb5_authdata *), &code); + sign_authdata = k5calloc(i + 1, sizeof(krb5_authdata *), &code); if (sign_authdata == NULL) return code; @@ -1018,8 +1018,8 @@ make_ad_signedpath(krb5_context context, } else i = 0; - sp.delegated = k5alloc((i + (server ? 1 : 0) + 1) * - sizeof(krb5_principal), &code); + sp.delegated = k5calloc(i + (server ? 1 : 0) + 1, sizeof(krb5_principal), + &code); if (code != 0) goto cleanup; diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c index 07b180f28..50cc2520d 100644 --- a/src/kdc/kdc_preauth.c +++ b/src/kdc/kdc_preauth.c @@ -1367,7 +1367,7 @@ etype_info_helper(krb5_context context, krb5_kdc_req *request, int i = 0, start = 0, seen_des = 0; int etype_info2 = (pa_type == KRB5_PADATA_ETYPE_INFO2); - entry = k5alloc((client->n_key_data * 2 + 1) * sizeof(*entry), &retval); + entry = k5calloc(client->n_key_data * 2 + 1, sizeof(*entry), &retval); if (entry == NULL) goto cleanup; entry[0] = NULL; |