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

[tlyu@MIT.EDU]

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

pull up r21909 from trunk

 ------------------------------------------------------------------------
 r21909 | ghudson | 2009-02-06 13:40:04 -0500 (Fri, 06 Feb 2009) | 9 lines
 Changed paths:
    M /trunk/src/lib/krb5/krb/walk_rtree.c

 ticket: 6375
 subject: Fix error handling in krb5_walk_realm_tree
 tags: pullup
 target_version: 1.7

 rtree_hier_realms was forgetting to assign the return value of
 krb5int_copy_data_contents to retval, which would cause a failure to
 notice out-of-memory conditions.

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


Changed Files:
U   branches/krb5-1-7/src/lib/krb5/krb/walk_rtree.c
Modified: branches/krb5-1-7/src/lib/krb5/krb/walk_rtree.c
===================================================================
--- branches/krb5-1-7/src/lib/krb5/krb/walk_rtree.c	2009-02-19 00:36:31 UTC (rev 22029)
+++ branches/krb5-1-7/src/lib/krb5/krb/walk_rtree.c	2009-02-19 00:36:51 UTC (rev 22030)
@@ -389,7 +389,7 @@
     }
     /* Copy server realm "tweens" backward. */
     for (twp = &stweens[nstween]; twp-- > stweens;) {
-	krb5int_copy_data_contents(context, twp, rp++);
+	retval = krb5int_copy_data_contents(context, twp, rp++);
 	if (retval) goto error;
     }
 error: