krb5 commit: Fix minor leaks in klist

Greg Hudson ghudson at MIT.EDU
Mon Jul 15 11:20:11 EDT 2013


https://github.com/krb5/krb5/commit/6e51f9cc3152c8e419fe7f459bcf521d60358434
commit 6e51f9cc3152c8e419fe7f459bcf521d60358434
Author: Greg Hudson <ghudson at mit.edu>
Date:   Mon Jul 15 11:14:24 2013 -0400

    Fix minor leaks in klist
    
    When walking the cache, if we skip a cred because it's a config entry,
    make sure to free it.  Also free the result of krb5_cc_get_principal.
    Based on a patch from Nalin Dahyabhai.

 src/clients/klist/klist.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
index 6c04067..745a460 100644
--- a/src/clients/klist/klist.c
+++ b/src/clients/klist/klist.c
@@ -520,9 +520,9 @@ do_ccache(krb5_ccache cache)
         return 1;
     }
     while (!(code = krb5_cc_next_cred(kcontext, cache, &cur, &creds))) {
-        if (!show_config && krb5_is_config_principal(kcontext, creds.server))
-            continue;
-        if (status_only) {
+        if (!show_config && krb5_is_config_principal(kcontext, creds.server)) {
+            /* Do nothing with this entry. */
+        } else if (status_only) {
             if (exit_status && creds.server->length == 2 &&
                 data_eq(creds.server->realm, princ->realm) &&
                 data_eq_string(creds.server->data[0], "krbtgt") &&
@@ -556,6 +556,7 @@ do_ccache(krb5_ccache cache)
             com_err(progname, code, _("while retrieving a ticket"));
         return 1;
     }
+    krb5_free_principal(kcontext, princ);
 }
 
 char *


More information about the cvs-krb5 mailing list