diff --git a/lib/krb5/auth_context.c b/lib/krb5/auth_context.c
index 3c3a60a3c..ec5dd2b38 100644
--- a/lib/krb5/auth_context.c
+++ b/lib/krb5/auth_context.c
@@ -161,8 +161,8 @@ void
 krb5_free_keyblock(krb5_context context,
 		   krb5_keyblock *keyblock)
 {
-  krb5_data_free (&keyblock->contents);
-  free (keyblock);
+    memset(keyblock->contents.data, 0, keyblock->contents.length);
+    krb5_data_free (&keyblock->contents);
 }
 
 krb5_error_code