From owner-p4-projects@FreeBSD.ORG  Sun Sep 20 20:14:59 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 425F41065679; Sun, 20 Sep 2009 20:14:59 +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 06B27106566C
	for <perforce@freebsd.org>; Sun, 20 Sep 2009 20:14:59 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EA8938FC0C
	for <perforce@freebsd.org>; Sun, 20 Sep 2009 20:14:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8KKEwvW012432
	for <perforce@freebsd.org>; Sun, 20 Sep 2009 20:14:58 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8KKEweO012430
	for perforce@freebsd.org; Sun, 20 Sep 2009 20:14:58 GMT
	(envelope-from gabor@freebsd.org)
Date: Sun, 20 Sep 2009 20:14:58 GMT
Message-Id: <200909202014.n8KKEweO012430@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 168725 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: Sun, 20 Sep 2009 20:14:59 -0000

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

Change 168725 by gabor@gabor_server on 2009/09/20 20:14:53

	- Fix mbs -> wcs conversion in month sort routine

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/newsort/coll.c#7 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/newsort/coll.c#7 (text+ko) ====

@@ -338,8 +338,12 @@
 		for (int i = 0; i < 12; i++) {
 			tmp = nl_langinfo(item[i]);
 			len = strlen(tmp);
-			m = sort_malloc(sizeof(wint_t) * (len + 1));
-			mbstowcs(m, tmp, len);
+			m = sort_malloc((len + 1) * sizeof(wint_t));
+			if (mbstowcs(m, tmp, len) == ((size_t)-1)) {
+					months[i] = NULL;
+					continue;
+			}
+			m[len] = L'\0';
 			for (int j = 0; j < len; j++)
 				m[j] = towlower(m[j]);
 			months[i] = m;