From owner-p4-projects@FreeBSD.ORG  Mon Aug 18 11:16:09 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1AA6E106567F; Mon, 18 Aug 2008 11:16:09 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CF3F31065677
	for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 11:16:08 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C96D28FC16
	for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 11:16:08 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IBG84e023743
	for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 11:16:08 GMT
	(envelope-from konrad@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IBG8i8023741
	for perforce@freebsd.org; Mon, 18 Aug 2008 11:16:08 GMT
	(envelope-from konrad@FreeBSD.org)
Date: Mon, 18 Aug 2008 11:16:08 GMT
Message-Id: <200808181116.m7IBG8i8023741@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	konrad@FreeBSD.org using -f
From: Konrad Jankowski <konrad@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 147710 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Aug 2008 11:16:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=147710

Change 147710 by konrad@vspredator on 2008/08/18 11:15:11

	Fix memory leak in wcsxfrm - analogous to the fix to strxfrm earlier this week.

Affected files ...

.. //depot/projects/soc2008/konrad_collation/libc/string/wcsxfrm.c#7 edit

Differences ...

==== //depot/projects/soc2008/konrad_collation/libc/string/wcsxfrm.c#7 (text+ko) ====

@@ -43,8 +43,9 @@
 wcsxfrm(wchar_t * __restrict dest, const wchar_t * __restrict src, size_t len)
 {
 	size_t slen;
-	wchar_t *xf[2];
+	wchar_t *xf[COLL_WEIGHTS_MAX];
 	int sverrno;
+	int i;
 
 	if (*src == L'\0') {
 		if (len != 0)
@@ -91,8 +92,9 @@
 		*dest = 0;
  	}
 	sverrno = errno;
-	free(xf[0]);
-	free(xf[1]);
+	for (i = 0; i < __collate_data->__info.directive_count; i++) {
+		free(xf[i]);
+	}
 	errno = sverrno;
  
 	return (slen);