Simplify cleanup in obtain_sam_padata slightly

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

diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c
index 2ef38c2c5c70f8c7ef3eb1cbf2aafccdff0080a4..3a99c9dfaddfc7228f004495f3e040a555e11345 100644 (file)
--- a/src/lib/krb5/krb/preauth.c
+++ b/src/lib/krb5/krb/preauth.c
@@ -455,7 +455,7 @@ static krb5_error_code
 obtain_sam_padata(krb5_context context, krb5_pa_data *in_padata, krb5_etype_info etype_info, krb5_keyblock *def_enc_key, git_key_proc key_proc, krb5_const_pointer key_seed, krb5_creds *creds, krb5_kdc_req *request, krb5_pa_data **out_padata)
 {
     krb5_error_code            retval;
-    krb5_data *                        scratch;
+    krb5_data *                        scratch = 0;
     krb5_data                  tmpsam;
     krb5_pa_data *             pa;
     krb5_sam_challenge         *sam_challenge = 0;
@@ -566,9 +566,7 @@ obtain_sam_padata(krb5_context context, krb5_pa_data *in_padata, krb5_etype_info
     retval = 0;
     
 cleanup:
-    if (scratch)
-       krb5_free_data(context, scratch);
-    if (sam_challenge)
-        free(sam_challenge);
+    krb5_free_data(context, scratch);
+    free(sam_challenge);
     return retval;
 }