dash.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Andreas Bofjäll" <andreas@gazonk.org>
To: Jilles Tjoelker <jilles@stack.nl>
Cc: dash@vger.kernel.org
Subject: Re: [PATCH] trap: fix memory leak in exitshell()
Date: Tue, 22 Nov 2016 23:47:49 +0100 (CET)	[thread overview]
Message-ID: <alpine.LNX.2.20.1611222338400.12923@gazonk.org> (raw)
In-Reply-To: <20161122215103.GA91593@stack.nl>

On Tue, 22 Nov 2016, Jilles Tjoelker wrote:

> On Mon, Nov 21, 2016 at 10:40:52PM +0100, Andreas Bofjall wrote:
>> diff --git a/src/trap.c b/src/trap.c
>> index edb9938..5418b07 100644
>> --- a/src/trap.c
>> +++ b/src/trap.c
>> @@ -389,6 +389,7 @@ exitshell(void)
>>  		trap[0] = NULL;
>>  		evalskip = 0;
>>  		evalstring(p, 0);
>> +		ckfree(p);
>>  	}
>>  out:
>>  	/*
> This patch will shut up valgrind in the common case, but does not handle
> the general case. The command string may contain an error or invoke the
> exit builtin and in either case the command string will be leaked
> (SIGINT might be expected to have a similar effect, but behaves
> strangely from an EXIT trap in dash).
> You can probably use the exception handling already present in the
> function to fix this. Note that ckfree() should only be used while
> INTOFF is in effect, both to avoid longjmp'ing out of free() and to
> ensure exactly one free in the presence of interruptions and errors.

Thanks for the feedback! Would something simple like moving the call to 
ckfree() to after the out: label and wrapping it in INTOFF/INTON (thereby 
catching both the normal return path and the exception) be ok, or do you 
mean something more elaborate?


      reply	other threads:[~2016-11-22 22:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-21 21:40 [PATCH] trap: fix memory leak in exitshell() Andreas Bofjall
2016-11-22 21:51 ` Jilles Tjoelker
2016-11-22 22:47   ` Andreas Bofjäll [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LNX.2.20.1611222338400.12923@gazonk.org \
    --to=andreas@gazonk.org \
    --cc=dash@vger.kernel.org \
    --cc=jilles@stack.nl \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).