git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pierre Habouzit <madcoder@debian.org>
To: Junio C Hamano <gitster@pobox.com>,
	Bernt Hansen <bernt@alumni.uwaterloo.ca>
Cc: git@vger.kernel.org
Subject: [PATCH] Fix memory leak in apply_filter.
Date: Fri, 05 Oct 2007 10:27:11 +0200	[thread overview]
Message-ID: <20071005082711.GF19879@artemis.corp> (raw)
In-Reply-To: <20071005082026.GE19879@artemis.corp>

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---

While we're at it... Here is a stupid memory leak in apply_filter.
On top of the previous commit.

 convert.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/convert.c b/convert.c
index 4664197..d5c197f 100644
--- a/convert.c
+++ b/convert.c
@@ -293,10 +293,9 @@ static int apply_filter(const char *path, const char *src, size_t len,
 	}
 
 	if (ret) {
-		*dst = nbuf;
-	} else {
-		strbuf_release(&nbuf);
+		strbuf_swap(dst, &nbuf);
 	}
+	strbuf_release(&nbuf);
 	return ret;
 }
 
-- 
1.5.3.4.208.gdcc67-dirty

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

  parent reply	other threads:[~2007-10-05  8:27 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <87wsu2sad0.fsf@gollum.intra.norang.ca>
2007-10-05  8:20 ` [PATCH] Fix in-place editing in crlf_to_git and ident_to_git Pierre Habouzit
2007-10-05  8:11   ` [AGGREGATED PATCH] Fix in-place editing functions in convert.c Pierre Habouzit
2007-10-05  9:24     ` Johannes Sixt
2007-10-05 13:07     ` Bernt Hansen
2007-10-05 15:26     ` Linus Torvalds
2007-10-05 15:50       ` Pierre Habouzit
2007-10-05 16:21       ` Sam Ravnborg
2007-10-05 16:35         ` Pierre Habouzit
2007-10-05 17:25           ` Sam Ravnborg
2007-10-05 16:43         ` Linus Torvalds
2007-10-05 17:24           ` Sam Ravnborg
2007-10-05 18:05             ` Linus Torvalds
2007-10-05 19:27               ` Dmitry Potapov
2007-10-05 19:33                 ` Linus Torvalds
2007-10-05  8:27   ` Pierre Habouzit [this message]
2007-10-05  8:29   ` [PATCH] Fix memory leak in apply_filter Pierre Habouzit
2007-10-05  8:30   ` [PATCH] Fix in-place editing in crlf_to_git and ident_to_git Johannes Schindelin
2007-10-05  8:40     ` Pierre Habouzit

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=20071005082711.GF19879@artemis.corp \
    --to=madcoder@debian.org \
    --cc=bernt@alumni.uwaterloo.ca \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* 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).