From owner-p4-projects@FreeBSD.ORG  Thu Aug 28 23:03:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B06181065671; Thu, 28 Aug 2008 23:03:12 +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 747E9106564A
	for <perforce@freebsd.org>; Thu, 28 Aug 2008 23:03:12 +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 5C8108FC1A
	for <perforce@freebsd.org>; Thu, 28 Aug 2008 23:03:12 +0000 (UTC)
	(envelope-from gabor@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 m7SN3CQ9002010
	for <perforce@freebsd.org>; Thu, 28 Aug 2008 23:03:12 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7SN3C4U002008
	for perforce@freebsd.org; Thu, 28 Aug 2008 23:03:12 GMT
	(envelope-from gabor@freebsd.org)
Date: Thu, 28 Aug 2008 23:03:12 GMT
Message-Id: <200808282303.m7SN3C4U002008@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 148756 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: Thu, 28 Aug 2008 23:03:13 -0000

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

Change 148756 by gabor@gabor_server on 2008/08/28 23:02:40

	- Be more error-prone in the -w part
	
	Suggested by:	ache

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/util.c#74 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/util.c#74 (text+ko) ====

@@ -289,14 +289,22 @@
 				if (r == 0 && wflag && pmatch.rm_so != 0 && pmatch.rm_eo != l->len) {
 					wchar_t	*wbegin;
 					wint_t	 wend;
+					size_t	 size;
+
+					size = mbstowcs(NULL, l->dat, pmatch.rm_so);
 
-					wbegin = grep_malloc(mbstowcs(NULL, l->dat, pmatch.rm_so));
-					if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1)
+					if (size = -1)
 						r = REG_NOMATCH;
-					wend = sscanf(&l->dat[pmatch.rm_eo], "%lc", &wend);
-					if (iswword(wbegin[wcslen(wbegin)]) ||iswword(wend))
-						r = REG_NOMATCH;
-					free(wbegin);
+					else {
+						wbegin = grep_malloc(size);
+						if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1)
+							r = REG_NOMATCH;
+						else if (sscanf(&l->dat[pmatch.rm_eo], "%lc", &wend) != 1)
+							r = REG_NOMATCH;
+						else if (iswword(wbegin[wcslen(wbegin)]) ||iswword(wend))
+							r = REG_NOMATCH;
+						free(wbegin);
+					}
 				}
 				if (r == 0) {
 					if (m == 0)