git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 2/7] fix textconv leak in emit_rewrite_diff
Date: Thu, 1 Apr 2010 20:04:14 -0400	[thread overview]
Message-ID: <20100402000414.GB16462@coredump.intra.peff.net> (raw)
In-Reply-To: <20100402000159.GA15101@coredump.intra.peff.net>

We correctly free() for the normal diff case, but leak for
rewrite diffs.

Signed-off-by: Jeff King <peff@peff.net>
---
I suppose we never noticed this because rewrite diffs and textconv are
both uncommonly used codepaths, and leaking a little bit of textconv
probably just isn't that big a deal in a short-running process. But
stopping leaks is good.

 diff.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/diff.c b/diff.c
index 2daa732..db2cd5d 100644
--- a/diff.c
+++ b/diff.c
@@ -550,6 +550,10 @@ static void emit_rewrite_diff(const char *name_a,
 		emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
 	if (lc_b)
 		emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
+	if (textconv_one)
+		free(data_one);
+	if (textconv_two)
+		free(data_two);
 }
 
 struct diff_words_buffer {
-- 
1.7.0.4.299.gba9d4

  parent reply	other threads:[~2010-04-02  0:04 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-02  0:01 [PATCH 0/7] textconv caching Jeff King
2010-04-02  0:03 ` [PATCH 1/7] fix const-correctness of write_sha1_file Jeff King
2010-04-02  0:04 ` Jeff King [this message]
2010-04-02  0:05 ` [PATCH 3/7] make commit_tree a library function Jeff King
2010-04-02  0:07 ` [PATCH 4/7] introduce notes-cache interface Jeff King
2010-04-02  0:09 ` [PATCH 5/7] textconv: refactor calls to run_textconv Jeff King
2010-04-02  0:12 ` [PATCH 6/7] diff: cache textconv output Jeff King
2010-04-02  7:23   ` Junio C Hamano
2010-04-02  7:38     ` Jeff King
2010-04-02  0:14 ` [PATCH 7/7] diff: avoid useless filespec population Jeff King
2010-04-02  7:12   ` Junio C Hamano
2010-04-02  7:24     ` Jeff King
2010-04-02  6:14 ` [PATCH 0/7] textconv caching Jeff King

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=20100402000414.GB16462@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    /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).