From: Tom Yu <tlyu@mit.edu>
Date: Thu, 19 Feb 2009 00:38:09 +0000 (+0000)
Subject: pull up r21924 from trunk
X-Git-Tag: krb5-1.7-beta1~68
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7a40ec7f42c0808fac58bd32efe8e994b75697e3;p=krb5.git

pull up r21924 from trunk

 ------------------------------------------------------------------------
 r21924 | ghudson | 2009-02-09 13:52:40 -0500 (Mon, 09 Feb 2009) | 10 lines
 Changed paths:
    M /trunk/src/lib/krb5/krb/walk_rtree.c

 ticket: 6379
 subject: Fix possible free of uninitialized value in walk_rtree
 tags: pullup
 target_version: 1.7

 In rtree_hier_realms, if the first rtree_hier_tweens call failed, the
 cleanup handler would free stweens which had not been initialized.
 Initialize ctweens and stweens to NULL in the variable declarations to
 make the cleanup handler safe.

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

ticket: 6379
version_fixed: 1.7
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22034 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/walk_rtree.c b/src/lib/krb5/krb/walk_rtree.c
index c6e3156a2..5577bb909 100644
--- a/src/lib/krb5/krb/walk_rtree.c
+++ b/src/lib/krb5/krb/walk_rtree.c
@@ -365,7 +365,7 @@ rtree_hier_realms(
 {
     krb5_error_code retval;
     struct hstate c, s;
-    krb5_data *ctweens, *stweens, *twp, *r, *rp;
+    krb5_data *ctweens = NULL, *stweens = NULL, *twp, *r, *rp;
     size_t nctween, nstween;
 
     *realms = NULL;