From owner-svn-src-all@FreeBSD.ORG Fri Apr 18 12:34:11 2014
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:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 730055CC;
Fri, 18 Apr 2014 12:34:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 5F78E1A85;
Fri, 18 Apr 2014 12:34:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ICYBQB038673;
Fri, 18 Apr 2014 12:34:11 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3ICYBOB038672;
Fri, 18 Apr 2014 12:34:11 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201404181234.s3ICYBOB038672@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Fri, 18 Apr 2014 12:34:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r264643 - stable/9/bin/sh
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Fri, 18 Apr 2014 12:34:11 -0000
Author: jilles
Date: Fri Apr 18 12:34:10 2014
New Revision: 264643
URL: http://svnweb.freebsd.org/changeset/base/264643
Log:
MFC r263846: sh: Fix memory leak when trying to set a read only variable.
Modified:
stable/9/bin/sh/var.c
Directory Properties:
stable/9/bin/sh/ (props changed)
Modified: stable/9/bin/sh/var.c
==============================================================================
--- stable/9/bin/sh/var.c Fri Apr 18 08:31:55 2014 (r264642)
+++ stable/9/bin/sh/var.c Fri Apr 18 12:34:10 2014 (r264643)
@@ -339,8 +339,11 @@ setvareq(char *s, int flags)
mklocal(s);
vp = find_var(s, &vpp, &nlen);
if (vp != NULL) {
- if (vp->flags & VREADONLY)
+ if (vp->flags & VREADONLY) {
+ if ((flags & (VTEXTFIXED|VSTACK)) == 0)
+ ckfree(s);
error("%.*s: is read only", vp->name_len, s);
+ }
if (flags & VNOSET)
return;
INTOFF;