From: Andreas Schneider <asn@samba.org>
Date: Wed, 6 Aug 2014 14:06:54 +0000 (+0200)
Subject: Use zapfree in krb5_decrypt_tkt_part
X-Git-Tag: krb5-1.12.2-final~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df78452da0e4254b339039d7d9397d75f9d090b2;p=thirdparty%2Fkrb5.git

Use zapfree in krb5_decrypt_tkt_part

(cherry picked from commit 18333f731b8cb3b4610b1d623caef9347c785f7b)

ticket: 7982
version_fixed: 1.12.2
status: resolved
---

diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c
index db75c0fa4f..51f9e8fdfb 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;
 }