http-backend: fix die recursion with custom handler

When we die() in http-backend, we call a custom handler that writes an HTTP 500 response to stdout, then reports the error to stderr. Our routines for writing out the HTTP response may themselves die, leading to us entering die() again. When it was originally written, that was OK; our custom handler keeps a variable to notice this and does not recurse. However, since cd163d4 (usage.c: detect recursion in die routines and bail out immediately, 2012-11-14), the main die() implementation detects recursion before we even get to our custom handler, and bails without printing anything useful. We can handle this case by doing two things: 1. Installing a custom die_is_recursing handler that allows us to enter up to one level of recursion. Only the first call to our custom handler will try to write out the error response. So if we die again, that is OK. If we end up dying more than that, it is a sign that we are in an infinite recursion. 2. Reporting the error to stderr before trying to write out the HTTP response. In the current code, if we do die() trying to write out the response, we'll exit immediately from this second die(), and never get a chance to output the original error (which is almost certainly the more interesting one; the second die is just going to be along the lines of "I tried to write to stdout but it was closed"). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed May 15, 2015 at 02:29 UTC 7253a02348c1c44c84f8a13309d6d30b443bf23c
1 file changed +9 -5
http-backend.c
+9 -5
@@ -500,21 +500,24 @@ static void service_rpc(char *service_name)
500 strbuf_release(&buf);
501 }
502
503 +static int dead;
504 static NORETURN void die_webcgi(const char *err, va_list params)
505 {
505 - static int dead;
506 + if (dead <= 1) {
507 + vreportf("fatal: ", err, params);
508
507 - if (!dead) {
508 - dead = 1;
509 http_status(500, "Internal Server Error");
510 hdr_nocache();
511 end_headers();
512 -
513 - vreportf("fatal: ", err, params);
512 }
513 exit(0); /* we successfully reported a failure ;-) */
514 }
515
516 +static int die_webcgi_recursing(void)
517 +{
518 + return dead++ > 1;
519 +}
520 +
521 static char* getdir(void)
522 {
523 struct strbuf buf = STRBUF_INIT;
@@ -569,6 +572,7 @@ int main(int argc, char **argv)
572
573 git_extract_argv0_path(argv[0]);
574 set_die_routine(die_webcgi);
575 + set_die_is_recursing_routine(die_webcgi_recursing);
576
577 if (!method)
578 die("No REQUEST_METHOD from server");