From d9a3750473e2e2fb13c8a4002be890772ee54330 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 20 Nov 2023 08:46:01 +0000 Subject: git: return upon self->close I encountered the odd lack of `return' while chasing Gcf2 bugs on CentOS 7.x which resulted in commit 7d06b126e939 ("gcf2: fix autodie usage for older Perl") and commit e618c7654794 ("gcf2client: add alias for PublicInbox::Git::fail") before realizing the lack of `return' here wasn't the culprit behind failures on CentOS 7.x. However, the use of a `return' here appears required in case we actually hit the error path, since falling through and attempting my_readline with an undefined filehandle is always a failure. Fixes: e97a30e7624d ("lei: fix SIGPIPE on large result sets to pager") --- lib/PublicInbox/Git.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/PublicInbox') diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index 292c359a..bef524aa 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -276,7 +276,7 @@ sub cat_async_step ($$) { sub cat_async_wait ($) { my ($self) = @_; - $self->close if !$self->{sock}; + return $self->close if !$self->{sock}; my $inflight = $self->{inflight} or return; while (scalar(@$inflight)) { cat_async_step($self, $inflight); @@ -332,7 +332,7 @@ sub check_async_wait ($) { my ($self) = @_; return cat_async_wait($self) if $self->{-bc}; my $ck = $self->{ck} or return; - $ck->close if !$ck->{sock}; + return $ck->close if !$ck->{sock}; my $inflight = $ck->{inflight} or return; check_async_step($ck, $inflight) while (scalar(@$inflight)); } -- cgit v1.2.3-24-ge0c7