From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 13 May 2010 18:49:20 +0000 (+0000)
Subject: Error handling bug in krb5_init_creds_init()
X-Git-Tag: krb5-1.9-beta1~237
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=202383a7defa65fc1bc430343e3bc4dd0da04efd;p=krb5.git

Error handling bug in krb5_init_creds_init()

Fix a bug in krb5_init_creds_init() where a freed context could be
returned to the caller in certain error cases.

ticket: 6722
tags: pullup
target_version: 1.8.2

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24020 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index e97984f50..63402ca03 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -965,14 +965,15 @@ krb5_init_creds_init(krb5_context context,
         krb5_princ_type(context, ctx->request->client) = KRB5_NT_WELLKNOWN;
     }
     code = restart_init_creds_loop(context, ctx, NULL);
+    if (code)
+        goto cleanup;
 
     *pctx = ctx;
+    ctx = NULL;
 
 cleanup:
-    if (code != 0)
-        krb5_init_creds_free(context, ctx);
-    if (str != NULL)
-        free(str);
+    krb5_init_creds_free(context, ctx);
+    free(str);
 
     return code;
 }