user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 1/2] qspawn: capture errors from parse_hdr callback
Date: Mon, 30 Mar 2020 18:30:08 +0000	[thread overview]
Message-ID: <20200330183009.25541-2-e@yhbt.net> (raw)
In-Reply-To: <20200330183009.25541-1-e@yhbt.net>

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;

  reply	other threads:[~2020-03-30 18:30 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-30 18:30 [PATCH 0/2] viewvcs: fix streaming large blobs Eric Wong
2020-03-30 18:30 ` Eric Wong [this message]
2020-03-30 18:30 ` [PATCH 2/2] viewvcs: stream_blob_parse_hdr: fix BIN_DETECT retries Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200330183009.25541-2-e@yhbt.net \
    --to=e@yhbt.net \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public 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).