diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-06-07 13:15:27 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-06-07 13:15:27 -0400 |
| commit | fa295de3873bfbdb1ef7dda85e16f6a509fc88cc (patch) | |
| tree | 0eb98896c57bd49ffee30e64c79245208b2a7747 /src/kdc | |
| parent | 1523033c95693c635c53dcc990b9269771e80707 (diff) | |
| download | krb5-fa295de3873bfbdb1ef7dda85e16f6a509fc88cc.zip krb5-fa295de3873bfbdb1ef7dda85e16f6a509fc88cc.tar.gz krb5-fa295de3873bfbdb1ef7dda85e16f6a509fc88cc.tar.bz2 | |
Fix memory leak in dbentry_supports_enctype in KDC
The etypes list was never freed. Also use k5_etypes_contains.
Diffstat (limited to 'src/kdc')
| -rw-r--r-- | 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. */ |