svn rev #24062: branches/krb5-1-8/src/lib/krb5/krb/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24062
Commit By: tlyu
Log Message:
ticket: 6722
version_fixed: 1.8.2
status: resolved

pull up r24020 from trunk

 ------------------------------------------------------------------------
 r24020 | ghudson | 2010-05-13 14:49:20 -0400 (Thu, 13 May 2010) | 8 lines

 ticket: 6722
 subject: Error handling bug in krb5_init_creds_init()
 tags: pullup
 target_version: 1.8.2

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


Changed Files:
U   branches/krb5-1-8/src/lib/krb5/krb/get_in_tkt.c
Modified: branches/krb5-1-8/src/lib/krb5/krb/get_in_tkt.c
===================================================================
--- branches/krb5-1-8/src/lib/krb5/krb/get_in_tkt.c	2010-05-19 18:52:46 UTC (rev 24061)
+++ branches/krb5-1-8/src/lib/krb5/krb/get_in_tkt.c	2010-05-19 18:52:49 UTC (rev 24062)
@@ -1489,14 +1489,15 @@
         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;
 }