mirror of
https://github.com/postgres/postgres.git
synced 2025-07-05 07:21:24 +03:00
Avoid calling pqsignal() with invalid signals on Windows frontends.
As noted by the comment at the top of port/pqsignal.c, Windows frontend programs can only use pqsignal() with the 6 signals required by C. Most places avoid using invalid signals via #ifndef WIN32, but initdb and pg_test_fsync check whether the signal itself is defined, which doesn't work because win32_port.h defines many extra signals for the signal emulation code. pg_regress seems to have missed the memo completely. These issues aren't causing any real problems today because nobody checks the return value of pqsignal(), but a follow-up commit will add some error checking. To fix, surround all frontend calls to pqsignal() that use signals that are invalid on Windows with #ifndef WIN32. We cannot simply skip defining the extra signals in win32_port.h for frontends because they are needed in places such as pgkill(). Reviewed-by: Thomas Munro Discussion: https://postgr.es/m/Z4chOKfnthRH71mw%40nathan
This commit is contained in:
@ -112,11 +112,10 @@ main(int argc, char *argv[])
|
||||
/* Prevent leaving behind the test file */
|
||||
pqsignal(SIGINT, signal_cleanup);
|
||||
pqsignal(SIGTERM, signal_cleanup);
|
||||
|
||||
/* the following are not valid on Windows */
|
||||
#ifndef WIN32
|
||||
pqsignal(SIGALRM, process_alarm);
|
||||
#endif
|
||||
#ifdef SIGHUP
|
||||
/* Not defined on win32 */
|
||||
pqsignal(SIGHUP, signal_cleanup);
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user