From 161882a7617a6d06953e3fff1bb72765f6832300 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 19 Feb 2009 00:36:51 +0000 Subject: [PATCH] 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. ------------------------------------------------------------------------ ticket: 6375 version_fixed: 1.7 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22030 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/walk_rtree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/krb5/krb/walk_rtree.c b/src/lib/krb5/krb/walk_rtree.c index 4cebce526..ba15489d6 100644 --- a/src/lib/krb5/krb/walk_rtree.c +++ b/src/lib/krb5/krb/walk_rtree.c @@ -389,7 +389,7 @@ rtree_hier_realms( } /* 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: -- 2.26.2