From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 20 Dec 2012 19:19:16 +0000 (-0500)
Subject: Remove inoperative null checks in KDC code
X-Git-Tag: krb5-1.12-alpha1~384
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41b35299cbfa6a47e93f56344cd2e52dd4418ce6;p=thirdparty%2Fkrb5.git

Remove inoperative null checks in KDC code

In prepare_error_tgs, kdc_free_rstate, and kdc_fast_handle_error,
remove unnecessary null checks.  The callers avoid passing null
states, and in each case we've already dereferenced the pointer
earlier.  Reported by Nickolai Zeldovich <nickolai@csail.mit.edu>.

ticket: 7511
---

diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
index d41bc5d4ee..1d56566407 100644
--- a/src/kdc/do_tgs_req.c
+++ b/src/kdc/do_tgs_req.c
@@ -881,10 +881,8 @@ prepare_error_tgs (struct kdc_request_state *state,
     } else
         errpkt.e_data = empty_data();
 
-    if (state) {
-        retval = kdc_fast_handle_error(kdc_context, state, request, e_data,
-                                       &errpkt, &fast_edata);
-    }
+    retval = kdc_fast_handle_error(kdc_context, state, request, e_data,
+                                   &errpkt, &fast_edata);
     if (retval) {
         free(scratch);
         free(errpkt.text.data);
diff --git a/src/kdc/fast_util.c b/src/kdc/fast_util.c
index 1ce27d689b..1dd5f3ebf3 100644
--- a/src/kdc/fast_util.c
+++ b/src/kdc/fast_util.c
@@ -297,8 +297,6 @@ kdc_free_rstate (struct kdc_request_state *s)
 {
     kdc_realm_t *kdc_active_realm = s->realm_data;
 
-    if (s == NULL)
-        return;
     if (s->armor_key)
         krb5_free_keyblock(kdc_context, s->armor_key);
     if (s->strengthen_key)
@@ -418,7 +416,7 @@ kdc_fast_handle_error(krb5_context context,
 
     *fast_edata_out = NULL;
     memset(outer_pa, 0, sizeof(outer_pa));
-    if (!state || !state->armor_key)
+    if (state->armor_key == NULL)
         return 0;
     fx_error = *err;
     fx_error.e_data.data = NULL;