[26607] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix memory leak in dbentry_supports_enctype in KDC
daemon@ATHENA.MIT.EDU (Greg Hudson)
Thu Jun 7 13:15:48 2012
Date: Thu, 7 Jun 2012 13:15:39 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201206071715.q57HFdbv013785@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/fa295de3873bfbdb1ef7dda85e16f6a509fc88cc
commit fa295de3873bfbdb1ef7dda85e16f6a509fc88cc
Author: Greg Hudson <ghudson@mit.edu>
Date: Thu Jun 7 13:15:27 2012 -0400
Fix memory leak in dbentry_supports_enctype in KDC
The etypes list was never freed. Also use k5_etypes_contains.
src/kdc/kdc_util.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
index 3f3b406..3c2169e 100644
--- a/src/kdc/kdc_util.c
+++ b/src/kdc/kdc_util.c
@@ -1525,8 +1525,8 @@ dbentry_supports_enctype(krb5_context context, krb5_db_entry *server,
krb5_key_data *datap;
char *etypes_str = NULL;
krb5_enctype default_enctypes[1] = { 0 };
- krb5_enctype *etypes;
- size_t i;
+ krb5_enctype *etypes = NULL;
+ krb5_boolean in_list;
/* Look up the supported session key enctypes list in the KDB. */
retval = krb5_dbe_get_string(context, server, KRB5_KDB_SK_SESSION_ENCTYPES,
@@ -1536,17 +1536,16 @@ dbentry_supports_enctype(krb5_context context, krb5_db_entry *server,
retval = krb5int_parse_enctype_list(context, "KDB-session_etypes",
etypes_str, default_enctypes,
&etypes);
- free(etypes_str);
if (retval == 0 && etypes != NULL && etypes[0]) {
- for (i = 0; etypes[i]; i++)
- if (enctype == etypes[i])
- return TRUE;
- return FALSE;
+ in_list = k5_etypes_contains(etypes, enctype);
+ free(etypes_str);
+ free(etypes);
+ return in_list;
}
/* Fall through on error or empty list */
- } else {
- free(etypes_str);
}
+ free(etypes_str);
+ free(etypes);
/* If configured to, assume every server without a session_enctypes
* attribute supports DES_CBC_CRC. */
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
