From: Sam Hartman <hartmans@mit.edu>
Date: Tue, 19 Aug 2003 20:32:43 +0000 (+0000)
Subject: Don't double free the encrypted credential part
X-Git-Tag: krb5-1.4-beta1~770
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=112b9682e3e7c4363e7bdc7a9c9f87d9f57c718c;p=krb5.git

Don't double free the encrypted credential part

Ticket: 1731
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15773 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 80163b8a3..229336eaf 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-19  SamHartman  <hartmans@avalanche-breakdown.mit.edu>
+
+	* rd_cred.c (decrypt_credencdata): Don't double free credentials.
+
 2003-08-08  Tom Yu  <tlyu@mit.edu>
 
 	* gic_pwd.c (krb5_get_init_creds_password): If DNS SRV support is
diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c
index 0359d40c3..11be47f05 100644
--- a/src/lib/krb5/krb/rd_cred.c
+++ b/src/lib/krb5/krb/rd_cred.c
@@ -33,15 +33,11 @@ decrypt_credencdata(krb5_context context, krb5_cred *pcred, krb5_keyblock *pkeyb
 
     /*  now decode the decrypted stuff */
     if ((retval = decode_krb5_enc_cred_part(&scratch, &ppart)))
-    	goto cleanup_encpart;
+    	goto cleanup;
 
     *pcredenc = *ppart;
     retval = 0;
 
-cleanup_encpart:
-    memset(ppart, 0, sizeof(*ppart));
-    krb5_xfree(ppart);
-
 cleanup:
     memset(scratch.data, 0, scratch.length);
     krb5_xfree(scratch.data);