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

[tlyu@MIT.EDU]

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

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.

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


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:38:17 UTC (rev 22035)
+++ branches/krb5-1-7/src/lib/krb5/krb/walk_rtree.c	2009-02-19 00:38:27 UTC (rev 22036)
@@ -273,7 +273,7 @@
     memcpy(clientz, client->data, client->length);
 
     serverz = calloc(server->length + 1, 1);
-    if (clientz == NULL) {
+    if (serverz == NULL) {
 	retval = ENOMEM;
 	goto error;
     }