diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:41 -0700 |
| commit | 267ebf6c84eb4437c219c16848678b090b4af6e2 (patch) | |
| tree | b17c55b198e26df951cf556162775dd68765f688 /run-command.h | |
| parent | Merge branch 'jk/notes-dwim-doc' into maint (diff) | |
| parent | pager: don't use unsafe functions in signal handlers (diff) | |
| download | tgif-267ebf6c84eb4437c219c16848678b090b4af6e2.tar.xz | |
Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into maint
Allocation related functions and stdio are unsafe things to call
inside a signal handler, and indeed killing the pager can cause
glibc to deadlock waiting on allocation mutex as our signal handler
tries to free() some data structures in wait_for_pager(). Reduce
these unsafe calls.
* ti/glibc-stdio-mutex-from-signal-handler:
pager: don't use unsafe functions in signal handlers
Diffstat (limited to 'run-command.h')
| -rw-r--r-- | run-command.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/run-command.h b/run-command.h index 5b4425a3cb..275d35c442 100644 --- a/run-command.h +++ b/run-command.h @@ -50,6 +50,7 @@ void child_process_init(struct child_process *); int start_command(struct child_process *); int finish_command(struct child_process *); +int finish_command_in_signal(struct child_process *); int run_command(struct child_process *); /* |