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

pull up r21980 from trunk

 ------------------------------------------------------------------------
 r21980 | ghudson | 2009-02-12 12:51:45 -0500 (Thu, 12 Feb 2009) | 8 lines
 Changed paths:
    M /trunk/src/lib/krb5/krb/walk_rtree.c

 ticket: 6392
 subject: Fix allocation failure check in walk_rtree
 tags: pullup
 target_version: 1.7

 Check the correct variable for null after allocating the server string
 in rtree_capath_vals.

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

ticket: 6392
version_fixed: 1.7
status: resolved

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

diff --git a/src/lib/krb5/krb/walk_rtree.c b/src/lib/krb5/krb/walk_rtree.c
index 5577bb909..a22f5864a 100644
--- a/src/lib/krb5/krb/walk_rtree.c
+++ b/src/lib/krb5/krb/walk_rtree.c
@@ -273,7 +273,7 @@ rtree_capath_vals(
     memcpy(clientz, client->data, client->length);
 
     serverz = calloc(server->length + 1, 1);
-    if (clientz == NULL) {
+    if (serverz == NULL) {
 	retval = ENOMEM;
 	goto error;
     }