From 740db9e58da0cb548d6c9f6534e0047a96298c47 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 30 Mar 2020 18:30:08 +0000 Subject: [PATCH] qspawn: capture errors from parse_hdr callback User-supplied callbacks may fail, so capture the error instead of propagating it up the stack into the public-inbox-httpd event loop. --- lib/PublicInbox/Qspawn.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm index 34b6912f..aebcb1f7 100644 --- a/lib/PublicInbox/Qspawn.pm +++ b/lib/PublicInbox/Qspawn.pm @@ -234,7 +234,11 @@ sub rd_hdr ($) { length($$hdr_buf)); if (defined($r)) { $total_rd += $r; - $ret = $ph_cb->($total_rd, $hdr_buf, $ph_arg); + eval { $ret = $ph_cb->($total_rd, $hdr_buf, $ph_arg) }; + if ($@) { + log_err($self->{psgi_env}, "parse_hdr: $@"); + $ret = [ 500, [], [ "Internal error\n" ] ]; + } } else { # caller should notify us when it's ready: return if $! == EAGAIN; -- 2.44.0