[28519] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.12]: Use zapfree in krb5_decrypt_tkt_part
daemon@ATHENA.MIT.EDU (Tom Yu)
Thu Aug 7 18:41:45 2014
Date: Thu, 7 Aug 2014 18:39:51 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201408072239.s77Mdp3T031049@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/df78452da0e4254b339039d7d9397d75f9d090b2
commit df78452da0e4254b339039d7d9397d75f9d090b2
Author: Andreas Schneider <asn@samba.org>
Date: Wed Aug 6 16:06:54 2014 +0200
Use zapfree in krb5_decrypt_tkt_part
(cherry picked from commit 18333f731b8cb3b4610b1d623caef9347c785f7b)
ticket: 7982
version_fixed: 1.12.2
status: resolved
src/lib/krb5/krb/decrypt_tk.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c
index db75c0f..51f9e8f 100644
--- a/src/lib/krb5/krb/decrypt_tk.c
+++ b/src/lib/krb5/krb/decrypt_tk.c
@@ -60,14 +60,11 @@ krb5_decrypt_tkt_part(krb5_context context, const krb5_keyblock *srv_key, regist
return retval;
}
-#define clean_scratch() {memset(scratch.data, 0, scratch.length); \
- free(scratch.data);}
-
/* now decode the decrypted stuff */
retval = decode_krb5_enc_tkt_part(&scratch, &dec_tkt_part);
if (!retval) {
ticket->enc_part2 = dec_tkt_part;
}
- clean_scratch();
+ zapfree(scratch.data, scratch.length);
return retval;
}
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
