From owner-p4-projects@FreeBSD.ORG  Thu Sep 17 16:30:18 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A6B031065698; Thu, 17 Sep 2009 16:30:18 +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 6AFD61065694
	for <perforce@freebsd.org>; Thu, 17 Sep 2009 16:30:18 +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 5A6C18FC08
	for <perforce@freebsd.org>; Thu, 17 Sep 2009 16:30:18 +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 n8HGUIbj007038
	for <perforce@freebsd.org>; Thu, 17 Sep 2009 16:30:18 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8HGUIAt007036
	for perforce@freebsd.org; Thu, 17 Sep 2009 16:30:18 GMT
	(envelope-from gabor@freebsd.org)
Date: Thu, 17 Sep 2009 16:30:18 GMT
Message-Id: <200909171630.n8HGUIAt007036@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 168625 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, 17 Sep 2009 16:30:18 -0000

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

Change 168625 by gabor@gabor_aspire on 2009/09/17 16:29:24

	- Fix binary checking by eliminating an early free()

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/file.c#47 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#86 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/file.c#47 (text+ko) ====

@@ -243,7 +243,6 @@
 		BZ2_bzclose(f->bzf);
 		break;
 	}
-	free(f);
 
 	/* Reset read buffer for the file we are closing */
 	binbufptr = NULL;

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

@@ -196,6 +196,7 @@
 		/* Return if we need to skip a binary file */
 		if (f->binary && binbehave == BINFILE_SKIP) {
 			grep_close(f);
+			free(f);
 			return (0);
 		}
 		/* Process the file line-by-line */
@@ -229,6 +230,7 @@
 	    binbehave == BINFILE_BIN && f->binary && !qflag)
 		printf(getstr(9), fn);
 
+	free(f);
 	return (c);
 }