git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / Atom feed
* [PATCH] sha1-file: release strbuf after use
@ 2019-08-07 11:15 René Scharfe
  2019-08-07 12:49 ` Jeff King
  2019-08-07 13:51 ` Derrick Stolee
  0 siblings, 2 replies; 3+ messages in thread
From: René Scharfe @ 2019-08-07 11:15 UTC (permalink / raw)
  To: Git Mailing List; +Cc: Junio C Hamano, Jeff King

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] sha1-file: release strbuf after use
  2019-08-07 11:15 [PATCH] sha1-file: release strbuf after use René Scharfe
@ 2019-08-07 12:49 ` Jeff King
  2019-08-07 13:51 ` Derrick Stolee
  1 sibling, 0 replies; 3+ messages in thread
From: Jeff King @ 2019-08-07 12:49 UTC (permalink / raw)
  To: René Scharfe; +Cc: Git Mailing List, Junio C Hamano

On Wed, Aug 07, 2019 at 01:15:25PM +0200, René Scharfe wrote:

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

Thanks, the patch obviously looks good (though I wouldn't be sad for
some of your digging above to go into the commit message).

I had a vague feeling that we had seen this particular leak before (and
presumably the fix fell through the cracks). But I couldn't find it on
the list. I think after a while these strbuf_getline() leaks all start
to look the same. :)

-Peff

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] sha1-file: release strbuf after use
  2019-08-07 11:15 [PATCH] sha1-file: release strbuf after use René Scharfe
  2019-08-07 12:49 ` Jeff King
@ 2019-08-07 13:51 ` Derrick Stolee
  1 sibling, 0 replies; 3+ messages in thread
From: Derrick Stolee @ 2019-08-07 13:51 UTC (permalink / raw)
  To: René Scharfe, Git Mailing List; +Cc: Junio C Hamano, Jeff King

On 8/7/2019 7:15 AM, René Scharfe wrote:
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
> Patch generated with --function-context for easier review.

Thanks again. LGTM.

-Stolee

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-08-07 13:51 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-07 11:15 [PATCH] sha1-file: release strbuf after use René Scharfe
2019-08-07 12:49 ` Jeff King
2019-08-07 13:51 ` Derrick Stolee

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for the project(s) associated with this inbox:

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

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git