svn rev #22027: branches/krb5-1-7/src/lib/krb5/krb/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22027
Commit By: tlyu
Log Message:
ticket: 6372
version_fixed: 1.7
status: resolved

pull up r21901 from trunk

 ------------------------------------------------------------------------
 r21901 | ghudson | 2009-02-05 16:27:54 -0500 (Thu, 05 Feb 2009) | 8 lines
 Changed paths:
    M /trunk/src/lib/krb5/krb/mk_req_ext.c

 ticket: 6372
 subject: Fix memory handling bug in mk_req_ext
 tags: pullup
 target_version: 1.7

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

 ------------------------------------------------------------------------


Changed Files:
U   branches/krb5-1-7/src/lib/krb5/krb/mk_req_ext.c
Modified: branches/krb5-1-7/src/lib/krb5/krb/mk_req_ext.c
===================================================================
--- branches/krb5-1-7/src/lib/krb5/krb/mk_req_ext.c	2009-02-19 00:35:56 UTC (rev 22026)
+++ branches/krb5-1-7/src/lib/krb5/krb/mk_req_ext.c	2009-02-19 00:36:07 UTC (rev 22027)
@@ -391,6 +391,7 @@
 	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 @@
 
     adata[i + 1] = NULL;
 
-    *authdata = adata;
-
     return 0;
 }