From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 5 Feb 2009 21:27:54 +0000 (+0000)
Subject: Fix memory handling bug in mk_req_ext
X-Git-Tag: krb5-1.8-alpha1~703
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=29e1221373f5547c8a46f1e809e94b96bbca69d6;p=krb5.git

Fix memory handling bug in mk_req_ext

In make_etype_list, assign *authdata before we have a chance to fail,
since we may have invalidated the previous value with realloc.

ticket: 6372
tags: pullup
target_version: 1.7

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

diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c
index 2d700aec8..ed23fef4b 100644
--- a/src/lib/krb5/krb/mk_req_ext.c
+++ b/src/lib/krb5/krb/mk_req_ext.c
@@ -391,6 +391,7 @@ make_etype_list(krb5_context context,
 	krb5_free_data(context, ad_if_relevant);
 	return ENOMEM;
     }
+    *authdata = adata;
 
     adata[i] = (krb5_authdata *)malloc(sizeof(krb5_authdata));
     if (adata[i] == NULL) {
@@ -405,8 +406,6 @@ make_etype_list(krb5_context context,
 
     adata[i + 1] = NULL;
 
-    *authdata = adata;
-
     return 0;
 }