From: Eric Wong <e@80x24.org>
Date: Sat, 25 Sep 2021 05:49:45 +0000 (+0000)
Subject: lei2mail: augment_inprogress: guard against closed FDs
X-Git-Tag: v1.7.0~274
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=562cae2dc6dfd8b6ae85094115f67fe8d57cec8e;p=public-inbox.git

lei2mail: augment_inprogress: guard against closed FDs

I'm not sure what caused it, but $err was undef and caused print
to fail, leading to an event loop error.  Guard the timer with
an eval and assume warn() can't trigger an event loop failure.
---

diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index ed609081..467b27bf 100644
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -789,12 +789,15 @@ sub wq_atexit_child {
 # runs on a 1s timer in lei-daemon
 sub augment_inprogress {
 	my ($err, $opt, $dst, $au_noted) = @_;
-	$$au_noted++ and return;
-	print $err '# '.($opt->{'import-before'} ?
-			"importing non-external contents of $dst" : (
-			($opt->{dedupe} // 'content') ne 'none') ?
-			"scanning old contents of $dst for dedupe" :
-			"removing old contents of $dst")." ...\n";
+	eval {
+		return if $$au_noted++ || !$err || !defined(fileno($err));
+		print $err '# '.($opt->{'import-before'} ?
+				"importing non-external contents of $dst" : (
+				($opt->{dedupe} // 'content') ne 'none') ?
+				"scanning old contents of $dst for dedupe" :
+				"removing old contents of $dst")." ...\n";
+	};
+	warn "E: $@" if $@;
 }
 
 # called in top-level lei-daemon when LeiAuth is done