From: Greg Hudson <ghudson@mit.edu>
Date: Fri, 15 Mar 2013 05:57:40 +0000 (-0400)
Subject: Fix use-before-init in two test programs
X-Git-Tag: krb5-1.12-alpha1~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=525eafc83a0fbe8f215b7749b5774d54468a19d1;p=thirdparty%2Fkrb5.git

Fix use-before-init in two test programs

If krb5_init_context fails, use a null context for getting the error
message, not a context we haven't yet initialized.  Observed by David
Benjamin <davidben@mit.edu> using clang.
---

diff --git a/src/lib/krb5/krb/t_cc_config.c b/src/lib/krb5/krb/t_cc_config.c
index 3750a59ed8..04e7283d2b 100644
--- a/src/lib/krb5/krb/t_cc_config.c
+++ b/src/lib/krb5/krb/t_cc_config.c
@@ -117,7 +117,7 @@ main(int argc, char **argv)
     int c;
     unsigned int i;
 
-    bail_on_err(context, "Error initializing Kerberos library",
+    bail_on_err(NULL, "Error initializing Kerberos library",
                 krb5_init_context(&context));
     bail_on_err(context, "Error getting location of default ccache",
                 krb5_cc_default(context, &ccache));
diff --git a/src/lib/krb5/krb/t_in_ccache.c b/src/lib/krb5/krb/t_in_ccache.c
index c73a043371..30b7f281a9 100644
--- a/src/lib/krb5/krb/t_in_ccache.c
+++ b/src/lib/krb5/krb/t_in_ccache.c
@@ -95,7 +95,7 @@ main(int argc, char **argv)
     user = argv[optind];
     password = argv[optind + 1];
 
-    bail_on_err(ctx, "Error initializing Kerberos", krb5_init_context(&ctx));
+    bail_on_err(NULL, "Error initializing Kerberos", krb5_init_context(&ctx));
     bail_on_err(ctx, "Error allocating space for get_init_creds options",
                 krb5_get_init_creds_opt_alloc(ctx, &opt));
     if (in_ccname != NULL) {