pull up r23672 from trunk
authorTom Yu <tlyu@mit.edu>
Mon, 8 Feb 2010 20:55:12 +0000 (20:55 +0000)
committerTom Yu <tlyu@mit.edu>
Mon, 8 Feb 2010 20:55:12 +0000 (20:55 +0000)
 ------------------------------------------------------------------------
 r23672 | tlyu | 2010-01-26 13:43:29 -0500 (Tue, 26 Jan 2010) | 6 lines

 ticket: 6599
 target_version: 1.8
 tags: pullup

 Apply patch from Arlene Berry to plug a memory leak.

ticket: 6599
version_fixed: 1.8
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@23700 dc483132-0cff-0310-8789-dd5450dbe970

src/lib/krb5/krb/rd_req_dec.c

index 49f07f7ed670ad717b509fac7fbf31dbb9bf06d9..3a9b9ee7e312df543cd65a8f2ed61eb6be92c247 100644 (file)
@@ -114,8 +114,10 @@ rd_req_decrypt_tkt_part(krb5_context context, const krb5_ap_req *req,
 
         while ((code = krb5_kt_next_entry(context, keytab,
                                           &ktent, &cursor)) == 0) {
-            if (ktent.key.enctype != req->ticket->enc_part.enctype)
+            if (ktent.key.enctype != req->ticket->enc_part.enctype) {
+                (void) krb5_free_keytab_entry_contents(context, &ktent);
                 continue;
+            }
 
             retval = krb5_decrypt_tkt_part(context, &ktent.key,
                                            req->ticket);