From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Nov 2012 02:44:36 +0000 (-0800)
Subject: Merge branch 'bc/do-not-recurse-in-die'
X-Git-Tag: v1.8.1-rc0~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e0a7f2bbbbe9adfc9389c91a58ae44f85538e575?hp=f225f9b72092569b12a1921c98142dbdb325abc3

Merge branch 'bc/do-not-recurse-in-die'

* bc/do-not-recurse-in-die:
usage.c: detect recursion in die routines and bail out immediately
---

diff --git a/usage.c b/usage.c
index a2a6678004..8eab28113a 100644
--- a/usage.c
+++ b/usage.c
@@ -6,6 +6,8 @@
 #include "git-compat-util.h"
 #include "cache.h"
 
+static int dying;
+
 void vreportf(const char *prefix, const char *err, va_list params)
 {
 	char msg[4096];
@@ -82,6 +84,12 @@ void NORETURN die(const char *err, ...)
 {
 	va_list params;
 
+	if (dying) {
+		fputs("fatal: recursion detected in die handler\n", stderr);
+		exit(128);
+	}
+	dying = 1;
+
 	va_start(params, err);
 	die_routine(err, params);
 	va_end(params);
@@ -94,6 +102,13 @@ void NORETURN die_errno(const char *fmt, ...)
 	char str_error[256], *err;
 	int i, j;
 
+	if (dying) {
+		fputs("fatal: recursion detected in die_errno handler\n",
+			stderr);
+		exit(128);
+	}
+	dying = 1;
+
 	err = strerror(errno);
 	for (i = j = 0; err[i] && j < sizeof(str_error) - 1; ) {
 		if ((str_error[j++] = err[i++]) != '%')