From owner-p4-projects@FreeBSD.ORG  Sat Jun 14 19:44:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 841DC1065678; Sat, 14 Jun 2008 19:44:35 +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 3EBFD1065672
	for <perforce@freebsd.org>; Sat, 14 Jun 2008 19:44:35 +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 2F0EC8FC1B
	for <perforce@freebsd.org>; Sat, 14 Jun 2008 19:44:35 +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 m5EJiZeR055865
	for <perforce@freebsd.org>; Sat, 14 Jun 2008 19:44:35 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5EJiZJW055863
	for perforce@freebsd.org; Sat, 14 Jun 2008 19:44:35 GMT
	(envelope-from gabor@freebsd.org)
Date: Sat, 14 Jun 2008 19:44:35 GMT
Message-Id: <200806141944.m5EJiZJW055863@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 143466 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: Sat, 14 Jun 2008 19:44:36 -0000

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

Change 143466 by gabor@gabor_server on 2008/06/14 19:44:15

	- Add some checks after calling malloc
	- Improve --color, it almost works now

Affected files ...

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

Differences ...

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

@@ -228,19 +228,24 @@
 /* XXX: this color stuff does not work yet :( */
 				char	*tmp, *begin, *matched, *end;
 
-				begin = malloc(strlen(l->dat) - pmatch.rm_so + 2);
-				matched = malloc((pmatch.rm_eo - pmatch.rm_so + 1) * sizeof(char));
-				end = malloc(strlen(l->dat) - pmatch.rm_eo + 1);
+				if ((begin = malloc(strlen(l->dat) - pmatch.rm_so + 20)) == NULL)
+					errx(2, NULL);
+				if ((matched = malloc((pmatch.rm_eo - pmatch.rm_so + 20) * sizeof(char))) == NULL)
+					errx(2, NULL);
+				if ((end = malloc(strlen(l->dat) - pmatch.rm_eo + 20)) == NULL)
+					errx(2, NULL);
 
 				strlcpy(begin, l->dat, pmatch.rm_so + 1);
 				strlcpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1);
-				strlcpy(end, &(l->dat[pmatch.rm_eo]), strlen(l->dat) - strlen(begin) - strlen(matched) + 1);
+				strlcpy(end, &(l->dat[pmatch.rm_eo]), strlen(l->dat) - pmatch.rm_eo + 1);
+
 				asprintf(&tmp, "%s\33[%sm%s\33[00m%s", begin, color, matched, end);
 
 				free(begin);
 				free(matched);
 				free(end);
 
+				l->len += strlen(color) + 8;
 				l->dat = tmp;
 			}
 			if (r == 0 && oflag) {