svn rev #22014: branches/krb5-1-7/src/util/support/

[tlyu@MIT.EDU]

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

pull up r21881 from trunk

 ------------------------------------------------------------------------
 r21881 | ghudson | 2009-02-04 14:25:51 -0500 (Wed, 04 Feb 2009) | 7 lines
 Changed paths:
    M /trunk/src/util/support/utf8_conv.c

 ticket: 6360
 tags: pullup
 target_version: 1.7

 In krb5int_utf8s_to_ucs2les, free the correct value on error, instead
 of the caller-supplied result pointer.

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


Changed Files:
U   branches/krb5-1-7/src/util/support/utf8_conv.c
Modified: branches/krb5-1-7/src/util/support/utf8_conv.c
===================================================================
--- branches/krb5-1-7/src/util/support/utf8_conv.c	2009-02-18 18:14:48 UTC (rev 22013)
+++ branches/krb5-1-7/src/util/support/utf8_conv.c	2009-02-18 18:17:40 UTC (rev 22014)
@@ -199,7 +199,7 @@
 
     len = k5_utf8s_to_ucs2s((krb5_ucs2 *)*ucs2les, utf8s, chars + 1, 1);
     if (len < 0) {
-	free(ucs2les);
+	free(*ucs2les);
 	*ucs2les = NULL;
 	return EINVAL;
     }