From owner-svn-src-all@FreeBSD.ORG  Sat Jun  5 11:12:35 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 693E31065676;
	Sat,  5 Jun 2010 11:12:35 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 58E408FC14;
	Sat,  5 Jun 2010 11:12:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o55BCZcw006049;
	Sat, 5 Jun 2010 11:12:35 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o55BCZp7006047;
	Sat, 5 Jun 2010 11:12:35 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201006051112.o55BCZp7006047@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Sat, 5 Jun 2010 11:12:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208826 - head/usr.bin/calendar
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Jun 2010 11:12:35 -0000

Author: edwin
Date: Sat Jun  5 11:12:35 2010
New Revision: 208826
URL: http://svn.freebsd.org/changeset/base/208826

Log:
  Fix memory-leak at the processing of multiple calendars.
  
  Found with:   Coverity Prevent(tm)
  CID:          7085

Modified:
  head/usr.bin/calendar/io.c

Modified: head/usr.bin/calendar/io.c
==============================================================================
--- head/usr.bin/calendar/io.c	Sat Jun  5 11:06:56 2010	(r208825)
+++ head/usr.bin/calendar/io.c	Sat Jun  5 11:12:35 2010	(r208826)
@@ -107,8 +107,10 @@ cal(void)
 	tm.tm_wday = 0;
 
 	count = 0;
-	if ((fp = opencal()) == NULL)
+	if ((fp = opencal()) == NULL) {
+		free(extradata);
 		return;
+	}
 	while (fgets(buf, sizeof(buf), stdin) != NULL) {
 		if ((pp = strchr(buf, '\n')) != NULL)
 			*pp = '\0';
@@ -203,6 +205,7 @@ cal(void)
 
 	event_print_all(fp);
 	closecal(fp);
+	free(extradata);
 }
 
 FILE *