git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "René Scharfe" <l.s.r@web.de>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: [PATCH] sha1-file: release strbuf after use
Date: Wed, 7 Aug 2019 13:15:25 +0200	[thread overview]
Message-ID: <fa6ccb9f-11cd-7eec-fdbb-2de6a0bfcecf@web.de> (raw)

Signed-off-by: René Scharfe <l.s.r@web.de>
---
Patch generated with --function-context for easier review.

The plugged leak was added by a10a17877b (for_each_alternate_ref:
replace transport code with for-each-ref, 2017-02-08) and showed up in
709dfa6990 (object-store.h: move for_each_alternate_ref() from
transport.h, 2019-07-01), where it caught my eye, belatedly.

 sha1-file.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sha1-file.c b/sha1-file.c
index 84fd02f107..487ea35d2d 100644
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -773,32 +773,33 @@ static void fill_alternate_refs_command(struct child_process *cmd,
 static void read_alternate_refs(const char *path,
 				alternate_ref_fn *cb,
 				void *data)
 {
 	struct child_process cmd = CHILD_PROCESS_INIT;
 	struct strbuf line = STRBUF_INIT;
 	FILE *fh;

 	fill_alternate_refs_command(&cmd, path);

 	if (start_command(&cmd))
 		return;

 	fh = xfdopen(cmd.out, "r");
 	while (strbuf_getline_lf(&line, fh) != EOF) {
 		struct object_id oid;
 		const char *p;

 		if (parse_oid_hex(line.buf, &oid, &p) || *p) {
 			warning(_("invalid line while parsing alternate refs: %s"),
 				line.buf);
 			break;
 		}

 		cb(&oid, data);
 	}

 	fclose(fh);
 	finish_command(&cmd);
+	strbuf_release(&line);
 }

 struct alternate_refs_data {
--
2.22.0

             reply	other threads:[~2019-08-07 11:15 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-07 11:15 René Scharfe [this message]
2019-08-07 12:49 ` [PATCH] sha1-file: release strbuf after use Jeff King
2019-08-07 13:51 ` Derrick Stolee

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=fa6ccb9f-11cd-7eec-fdbb-2de6a0bfcecf@web.de \
    --to=l.s.r@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).