From nobody@FreeBSD.org  Mon Jul 18 16:02:33 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 15924106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Jul 2011 16:02:33 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 0546E8FC14
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Jul 2011 16:02:33 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p6IG2WDs083843
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Jul 2011 16:02:32 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p6IG2WpB083842;
	Mon, 18 Jul 2011 16:02:32 GMT
	(envelope-from nobody)
Message-Id: <201107181602.p6IG2WpB083842@red.freebsd.org>
Date: Mon, 18 Jul 2011 16:02:32 GMT
From: Henning Petersen <henning.petersen@t-online.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Memory leak in bin/ed/buf.c
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         159011
>Category:       bin
>Synopsis:       [patch] ed(1): Memory leak in bin/ed/buf.c
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    brueffer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 18 16:10:09 UTC 2011
>Closed-Date:    Sat Sep 03 23:29:07 CEST 2011
>Last-Modified:  Sat Sep 03 23:29:07 CEST 2011
>Originator:     Henning Petersen
>Release:        FreeBSD-current
>Organization:
>Environment:
>Description:
Memory leak in bin/ed/buf.c .
>How-To-Repeat:

>Fix:
diff -u -r1.22 buf.c
--- bin/ed/buf.c	30 Jun 2002 05:13:53 -0000	1.22
+++ bin/ed/buf.c	18 Jul 2011 13:19:28 -0000
@@ -94,6 +94,7 @@
 		;
 	if (s - cs >= LINECHARS) {
 		errmsg = "line too long";
+		free(lp);
 		return NULL;
 	}
 	len = s - cs;
@@ -102,6 +103,7 @@
 		if (fseeko(sfp, (off_t)0, SEEK_END) < 0) {
 			fprintf(stderr, "%s\n", strerror(errno));
 			errmsg = "cannot seek temp file";
+			free(lp);
 			return NULL;
 		}
 		sfseek = ftello(sfp);
@@ -112,6 +114,7 @@
 		sfseek = -1;
 		fprintf(stderr, "%s\n", strerror(errno));
 		errmsg = "cannot write temp file";
+		free(lp);
 		return NULL;
 	}
 	lp->len = len;


Patch attached with submission follows:

diff -u -r1.22 buf.c
--- bin/ed/buf.c	30 Jun 2002 05:13:53 -0000	1.22
+++ bin/ed/buf.c	18 Jul 2011 13:19:28 -0000
@@ -94,6 +94,7 @@
 		;
 	if (s - cs >= LINECHARS) {
 		errmsg = "line too long";
+		free(lp);
 		return NULL;
 	}
 	len = s - cs;
@@ -102,6 +103,7 @@
 		if (fseeko(sfp, (off_t)0, SEEK_END) < 0) {
 			fprintf(stderr, "%s\n", strerror(errno));
 			errmsg = "cannot seek temp file";
+			free(lp);
 			return NULL;
 		}
 		sfseek = ftello(sfp);
@@ -112,6 +114,7 @@
 		sfseek = -1;
 		fprintf(stderr, "%s\n", strerror(errno));
 		errmsg = "cannot write temp file";
+		free(lp);
 		return NULL;
 	}
 	lp->len = len;


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: brueffer 
State-Changed-When: Sat Aug 27 17:29:07 CEST 2011 
State-Changed-Why:  
Committed to HEAD, MFC pending. Thanks! 


Responsible-Changed-From-To: freebsd-bugs->brueffer 
Responsible-Changed-By: brueffer 
Responsible-Changed-When: Sat Aug 27 17:29:07 CEST 2011 
Responsible-Changed-Why:  
MFC reminder. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159011 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/159011: commit references a PR
Date: Sat, 27 Aug 2011 15:29:07 +0000 (UTC)

 Author: brueffer
 Date: Sat Aug 27 15:28:57 2011
 New Revision: 225215
 URL: http://svn.freebsd.org/changeset/base/225215
 
 Log:
   Fix memory leaks in error cases.
   
   PR:		159011
   Submitted by:	Henning Petersen <henning.petersen@t-online.de>
   Approved by:	re (kib)
   MFC after:	1 week
 
 Modified:
   head/bin/ed/buf.c
 
 Modified: head/bin/ed/buf.c
 ==============================================================================
 --- head/bin/ed/buf.c	Sat Aug 27 14:24:27 2011	(r225214)
 +++ head/bin/ed/buf.c	Sat Aug 27 15:28:57 2011	(r225215)
 @@ -94,6 +94,7 @@ put_sbuf_line(const char *cs)
  		;
  	if (s - cs >= LINECHARS) {
  		errmsg = "line too long";
 +		free(lp);
  		return NULL;
  	}
  	len = s - cs;
 @@ -102,6 +103,7 @@ put_sbuf_line(const char *cs)
  		if (fseeko(sfp, (off_t)0, SEEK_END) < 0) {
  			fprintf(stderr, "%s\n", strerror(errno));
  			errmsg = "cannot seek temp file";
 +			free(lp);
  			return NULL;
  		}
  		sfseek = ftello(sfp);
 @@ -112,6 +114,7 @@ put_sbuf_line(const char *cs)
  		sfseek = -1;
  		fprintf(stderr, "%s\n", strerror(errno));
  		errmsg = "cannot write temp file";
 +		free(lp);
  		return NULL;
  	}
  	lp->len = len;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: brueffer 
State-Changed-When: Sat Sep 3 23:28:44 CEST 2011 
State-Changed-Why:  
MFCs done. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159011 
>Unformatted:
