undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* bc/do-not-recurse-in-die:
  usage.c: detect recursion in die routines and bail out immediately
This commit is contained in:
Junio C Hamano 2012-11-25 18:44:36 -08:00
commit e0a7f2bbbb
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usage.c
View File

@ -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++]) != '%')