diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-11-25 18:44:36 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-11-25 18:44:36 -0800 |
commit | e0a7f2bbbbe9adfc9389c91a58ae44f85538e575 (patch) | |
tree | 710f7d4ae5549e6fb16ca589510354ecb650213d | |
parent | Merge branch 'mk/complete-tcsh' (diff) | |
parent | usage.c: detect recursion in die routines and bail out immediately (diff) | |
download | tgif-e0a7f2bbbbe9adfc9389c91a58ae44f85538e575.tar.xz |
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
-rw-r--r-- | usage.c | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -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++]) != '%') |