diff options
author | Eric Wong <e@80x24.org> | 2023-11-02 09:35:37 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2023-11-03 06:39:33 +0000 |
commit | 3aa444b4c4eef1c40a49e5db191eb844c6624b58 (patch) | |
tree | 73b724bfc7b76c7306497514e2f63177e022b3be | |
parent | 17ceb50fe054384dc65fdcbdc786dd125bf07947 (diff) | |
download | public-inbox-3aa444b4c4eef1c40a49e5db191eb844c6624b58.tar.gz |
readline (<FH>) isn't wrapped by autodie, and there's no way to know if read(2) errors truncated the readline output. IO::Handle->error isn't reliable on Perl < v5.34. Thus, combining the `eof' and `close' (combined with autodie) is the only way we can detect read(2) errors (injected via strace) when called via `readline' (aka <$fh>). Neither using `eof' nor `close' alone is sufficient, they must be combined to detect errors from buffered `readline'.
-rw-r--r-- | lib/PublicInbox/CodeSearchIdx.pm | 4 | ||||
-rw-r--r-- | lib/PublicInbox/Gcf2.pm | 2 | ||||
-rw-r--r-- | lib/PublicInbox/LeiInput.pm | 3 | ||||
-rw-r--r-- | lib/PublicInbox/LeiMirror.pm | 4 | ||||
-rw-r--r-- | lib/PublicInbox/Spawn.pm | 4 |
5 files changed, 10 insertions, 7 deletions
diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm index ad915fa2..0b00c303 100644 --- a/lib/PublicInbox/CodeSearchIdx.pm +++ b/lib/PublicInbox/CodeSearchIdx.pm @@ -57,7 +57,7 @@ use PublicInbox::Git qw(%OFMT2HEXLEN); use PublicInbox::Compat qw(uniqstr); use PublicInbox::Aspawn qw(run_await); use Carp (); -use autodie qw(pipe open sysread seek sysseek send); +use autodie qw(close pipe open sysread seek sysseek send); our $DO_QUIT = 15; # signal number our ( $LIVE_JOBS, # integer @@ -628,7 +628,7 @@ sub index_repo { # run_git cb my $roots_fh = delete $repo->{roots_fh} // die 'BUG: no {roots_fh}'; seek($roots_fh, 0, SEEK_SET); chomp(my @roots = <$roots_fh>); - close($roots_fh); + $roots_fh = eof($roots_fh) | close $roots_fh; # detect readline errors if (!@roots) { warn("E: $git->{git_dir} has no root commits\n"); return index_next($self); diff --git a/lib/PublicInbox/Gcf2.pm b/lib/PublicInbox/Gcf2.pm index 502bf33a..6ee0d7d9 100644 --- a/lib/PublicInbox/Gcf2.pm +++ b/lib/PublicInbox/Gcf2.pm @@ -11,6 +11,7 @@ use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); use IO::Handle; # autoflush use PublicInbox::Git; use PublicInbox::Lock; +use autodie qw(close); BEGIN { use autodie; @@ -81,6 +82,7 @@ sub add_alt ($$) { # See https://bugs.debian.org/975607 if (open(my $fh, '<', "$objdir/info/alternates")) { chomp(my @abs_alt = grep(m!^/!, <$fh>)); + $fh = eof($fh) | close $fh; # detect readline errors $gcf2->add_alternate($_) for @abs_alt; } $gcf2->add_alternate($objdir); diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm index f7c3f573..4cd18c09 100644 --- a/lib/PublicInbox/LeiInput.pm +++ b/lib/PublicInbox/LeiInput.pm @@ -80,7 +80,8 @@ sub input_net_cb { # imap_each, nntp_each cb sub input_fh { my ($self, $ifmt, $fh, $name, @args) = @_; if ($ifmt eq 'eml') { - my $buf = do { local $/; <$fh> } // + my $buf = do { local $/; <$fh> }; + (defined($buf) && eof($fh) && close($fh)) or return $self->{lei}->child_error(0, <<""); error reading $name: $! diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm index fb6517bd..e4914f75 100644 --- a/lib/PublicInbox/LeiMirror.pm +++ b/lib/PublicInbox/LeiMirror.pm @@ -309,9 +309,9 @@ sub fgrp_update { seek($srcfh, 0, SEEK_SET); seek($dstfh, 0, SEEK_SET); my %src = map { chomp; split(/\0/) } (<$srcfh>); - close $srcfh; my %dst = map { chomp; split(/\0/) } (<$dstfh>); - close $dstfh; + $srcfh = eof($srcfh) | close $srcfh; # detects readline errors + $dstfh = eof($dstfh) | close $dstfh; # ditto my $w = start_update_ref($fgrp) or return; my $lei = $fgrp->{lei}; my $ndel; diff --git a/lib/PublicInbox/Spawn.pm b/lib/PublicInbox/Spawn.pm index b0edeb33..8c798b39 100644 --- a/lib/PublicInbox/Spawn.pm +++ b/lib/PublicInbox/Spawn.pm @@ -22,7 +22,7 @@ use Carp qw(croak); use PublicInbox::IO; our @EXPORT_OK = qw(which spawn popen_rd popen_wr run_die run_wait run_qx); our @RLIMITS = qw(RLIMIT_CPU RLIMIT_CORE RLIMIT_DATA); -use autodie qw(open pipe seek sysseek truncate); +use autodie qw(close open pipe seek sysseek truncate); BEGIN { my $all_libc = <<'ALL_LIBC'; # all *nix systems we support @@ -405,7 +405,7 @@ sub read_out_err ($) { my $dst = $opt->{$fd}; $dst = $opt->{$fd} = $dst->[1] if ref($dst) eq 'ARRAY'; $$dst .= <$fh>; - $fh->error and croak "E: read(FD=$fd): $!"; + $fh = eof($fh) | close $fh; # detects readline errors } } |