* rd_req_dec.c (krb5_rd_req_decrypt_tkt_part): Free

	krb5_keytab_entry if call to krb5_decrypt_tkt_part()
	fails. [krb5-libs/855 reported by guy@packeteer.com]

Pullup from krb5-1-2

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 169964c801d4e14131eb1bbd10ca8568015566f0..d05ca178e2b8637986efa25117484fe2dd4b8a53 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-30  Ezra Peisach  <epeisach@mit.edu>
+
+       * rd_req_dec.c (krb5_rd_req_decrypt_tkt_part): Free
+       krb5_keytab_entry if call to krb5_decrypt_tkt_part()
+       fails. [krb5-libs/855 reported by guy@packeteer.com]
+
 2001-01-19  Ken Raeburn  <raeburn@mit.edu>
 
        * preauth.c: Don't use PROTOTYPE macro, just always use the
@@ -53,7 +59,7 @@
 2000-10-04  Ezra Peisach  <epeisach@mit.edu>
 
        * rd_req_dec.c (krb5_rd_req_decrypt_tkt_part): Fix memory leak if
-       krb5_decrypt_tkt_part() fails. (krb5-libs/855)
+       krb5_decrypt_tkt_part() fails. [krb5-libs/855]
 
 2000-10-03  Ezra Peisach  <epeisach@mit.edu>
 

diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index 4a799fc6563978d2769a4672cca5edcb42dc2a60..4e9f44ea0f85abe8521c09b360d9e2ae6bc8c1dd 100644 (file)
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -84,7 +84,7 @@ krb5_rd_req_decrypt_tkt_part(context, req, keytab)
        return retval;
 
     retval = krb5_decrypt_tkt_part(context, &ktent.key, req->ticket);
-    /* If error, we will return after freeing memory */
+    /* Upon error, Free keytab entry first, then return */
 
     (void) krb5_kt_free_entry(context, &ktent);
     return retval;