user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
* [PATCH] git_async_cat: unref pipes on EOF from git->cleanup
@ 2020-07-05 22:50 Eric Wong
  2020-07-06  6:11 ` [PATCH v2] " Eric Wong
  0 siblings, 1 reply; 3+ messages in thread
From: Eric Wong @ 2020-07-05 22:50 UTC (permalink / raw)
  To: meta

We avoided a managed circular reference in 10ee3548084c125f
but introduced a pipe FD leak, instead.  So handle the EOF
we get when the "git cat-file --batch" process exits and
closes its stdout FD.

Fixes: 10ee3548084c125f ("git_async_cat: remove circular reference")
---
 lib/PublicInbox/GitAsyncCat.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm
index 0b777204a..1bbbe8c58 100644
--- a/lib/PublicInbox/GitAsyncCat.pm
+++ b/lib/PublicInbox/GitAsyncCat.pm
@@ -24,7 +24,8 @@ sub _add {
 
 sub event_step {
 	my ($self) = @_;
-	my $git = $self->{git} or return; # ->close-ed
+	my $git = $self->{git};
+	return $self->close if ($git->{in} // 0) != $self->{sock};
 	my $inflight = $git->{inflight};
 	if ($inflight && @$inflight) {
 		$git->cat_async_step($inflight);
@@ -34,7 +35,7 @@ sub event_step {
 
 sub close {
 	my ($self) = @_;
-	if (my $git = delete $self->{git}) {
+	if (my $git = $self->{git}) {
 		delete $git->{async_cat};
 	}
 	$self->SUPER::close; # PublicInbox::DS::close

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

end of thread, other threads:[~2020-07-06 19:48 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-05 22:50 [PATCH] git_async_cat: unref pipes on EOF from git->cleanup Eric Wong
2020-07-06  6:11 ` [PATCH v2] " Eric Wong
2020-07-06 19:48   ` Eric Wong

Code repositories for project(s) associated with this inbox:

	https://80x24.org/public-inbox.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).