From 6b9e9222984f21ae22cb3bd407f2d5fb21e2f149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Mon, 10 Apr 2006 08:53:21 +0000 Subject: [PATCH] (krb5_build_authenticator): use calloc. removed check that was never really used. Coverity NetBSD CID#2370 git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17033 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/build_auth.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/krb5/build_auth.c b/lib/krb5/build_auth.c index c8a45e2c1..7f071080d 100644 --- a/lib/krb5/build_auth.c +++ b/lib/krb5/build_auth.c @@ -116,13 +116,12 @@ krb5_build_authenticator (krb5_context context, krb5_error_code ret; krb5_crypto crypto; - auth = malloc(sizeof(*auth)); + auth = calloc(1, sizeof(*auth)); if (auth == NULL) { krb5_set_error_string(context, "malloc: out of memory"); return ENOMEM; } - memset (auth, 0, sizeof(*auth)); auth->authenticator_vno = 5; copy_Realm(&cred->client->realm, &auth->crealm); copy_PrincipalName(&cred->client->name, &auth->cname); @@ -161,10 +160,8 @@ krb5_build_authenticator (krb5_context context, /* XXX - Copy more to auth_context? */ - if (auth_context) { - auth_context->authenticator->ctime = auth->ctime; - auth_context->authenticator->cusec = auth->cusec; - } + auth_context->authenticator->ctime = auth->ctime; + auth_context->authenticator->cusec = auth->cusec; ASN1_MALLOC_ENCODE(Authenticator, buf, buf_size, auth, &len, ret); if (ret)