summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2009-05-01 20:07:13 +0000
committerGreg Hudson <ghudson@mit.edu>2009-05-01 20:07:13 +0000
commitfb013ee162e24046b8e0270ff2e5626c8f8f398d (patch)
tree0b70f1f5b340346d26fdffabd67b135c71686100 /src/lib
parentd9a95617d7f78abe943ed7dde3bd12665163fa6b (diff)
downloadkrb5-fb013ee162e24046b8e0270ff2e5626c8f8f398d.tar.gz
krb5-fb013ee162e24046b8e0270ff2e5626c8f8f398d.tar.xz
krb5-fb013ee162e24046b8e0270ff2e5626c8f8f398d.zip
Move an error check to an earlier location in krb5_524_conv_principal
to fix a memory leak. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22300 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/krb5/krb/conv_princ.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c
index 3247893bc..43c588f0f 100644
--- a/src/lib/krb5/krb/conv_princ.c
+++ b/src/lib/krb5/krb/conv_princ.c
@@ -156,6 +156,9 @@ krb5_524_conv_principal(krb5_context context, krb5_const_principal princ,
unsigned int tmp_realm_len;
int retval;
+ if (context->profile == 0)
+ return KRB5_CONFIG_CANTOPEN;
+
*name = *inst = '\0';
switch (krb5_princ_size(context, princ)) {
case 2:
@@ -218,8 +221,6 @@ krb5_524_conv_principal(krb5_context context, krb5_const_principal princ,
/* Ask for v4_realm corresponding to
krb5 principal realm from krb5.conf realms stanza */
- if (context->profile == 0)
- return KRB5_CONFIG_CANTOPEN;
retval = profile_get_string(context->profile, KRB5_CONF_REALMS,
tmp_prealm, KRB5_CONF_V4_REALM, 0,
&tmp_realm);