From owner-p4-projects@FreeBSD.ORG  Tue Jun 24 19:29:30 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F26E61065670; Tue, 24 Jun 2008 19:29:29 +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 B485F106567F
	for <perforce@freebsd.org>; Tue, 24 Jun 2008 19:29:29 +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 95FA68FC13
	for <perforce@freebsd.org>; Tue, 24 Jun 2008 19:29:29 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5OJTTa7024678
	for <perforce@freebsd.org>; Tue, 24 Jun 2008 19:29:29 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OJTTSA024676
	for perforce@freebsd.org; Tue, 24 Jun 2008 19:29:29 GMT
	(envelope-from gabor@freebsd.org)
Date: Tue, 24 Jun 2008 19:29:29 GMT
Message-Id: <200806241929.m5OJTTSA024676@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 144040 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: Tue, 24 Jun 2008 19:29:30 -0000

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

Change 144040 by gabor@gabor_server on 2008/06/24 19:28:52

	- Don't forget to check if mbstowcs() succeeds
	
	Reported by:	tkientzle

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/binary.c#11 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/binary.c#11 (text+ko) ====

@@ -79,7 +79,8 @@
 
 	wbuf = grep_malloc((s + 1) * sizeof(wchar_t));
 
-	mbstowcs(wbuf, f->base, s);
+	if (mbstowcs(wbuf, f->base, s) == -1)
+		return (0);
 
 	/* XXX knows too much about mmf internals */
 	for (i = 0; i < BUFSIZ && i < f->len; i++)