mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-06 15:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set progname early in the postmaster/postgres binary, rather than doing

Browse Source 
it later.  This fixes a problem where EXEC_BACKEND didn't have progname
set, causing a segfault if log_min_messages was set below debug2 and our
own snprintf.c was being used.

Also alway strdup() progname.

Backpatch to 8.1.X and 8.0.X.
This commit is contained in:
Bruce Momjian 2006-02-01 00:47:03 +00:00
parent 2426c62140
commit 5eb493ab98
4 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/main/main.c
View File

@ -13,7 +13,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.94.4.1 2006/01/05 00:55:07 tgl Exp $ * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.94.4.2 2006/02/01 00:47:02 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -45,7 +45,7 @@
#include "libpq/pqsignal.h" #include "libpq/pqsignal.h"
#endif #endif
const char *progname;
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
@ -101,6 +101,8 @@ main(int argc, char *argv[])
#endif #endif
#endif /* NOFIXADE */ #endif /* NOFIXADE */
progname = get_progname(argv[0]);
#if defined(WIN32) #if defined(WIN32)
{ {
WSADATA wsaData; WSADATA wsaData;

8
src/backend/postmaster/postmaster.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.443.4.5 2006/01/06 02:58:40 tgl Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.443.4.6 2006/02/01 00:47:02 momjian Exp $
* *
* NOTES * NOTES
* *
@ -168,9 +168,6 @@ char *ListenAddresses;
*/ */
int ReservedBackends; int ReservedBackends;
static const char *progname = NULL;
/* The socket(s) we're listening to. */ /* The socket(s) we're listening to. */
#define MAXLISTEN 64 #define MAXLISTEN 64
static int ListenSocket[MAXLISTEN]; static int ListenSocket[MAXLISTEN];
@ -375,9 +372,6 @@ PostmasterMain(int argc, char *argv[])
char *userDoption = NULL; char *userDoption = NULL;
int i; int i;
/* This will call exit() if strdup() fails. */
progname = get_progname(argv[0]);
MyProcPid = PostmasterPid = getpid(); MyProcPid = PostmasterPid = getpid();
IsPostmasterEnvironment = true; IsPostmasterEnvironment = true;

3
src/include/postmaster/postmaster.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/postmaster/postmaster.h,v 1.9 2004/12/31 22:03:39 pgsql Exp $ * $PostgreSQL: pgsql/src/include/postmaster/postmaster.h,v 1.9.4.1 2006/02/01 00:47:03 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -34,6 +34,7 @@ extern char *rendezvous_name;
extern HANDLE PostmasterHandle; extern HANDLE PostmasterHandle;
#endif #endif
extern const char *progname;
extern int PostmasterMain(int argc, char *argv[]); extern int PostmasterMain(int argc, char *argv[]);
extern void ClosePostmasterPorts(bool am_syslogger); extern void ClosePostmasterPorts(bool am_syslogger);

37
src/port/path.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/port/path.c,v 1.50.4.2 2005/12/23 22:34:33 tgl Exp $ * $PostgreSQL: pgsql/src/port/path.c,v 1.50.4.3 2006/02/01 00:47:03 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -302,7 +302,8 @@ canonicalize_path(char *path)
const char * const char *
get_progname(const char *argv0) get_progname(const char *argv0)
{ {
const char *nodir_name; const char *nodir_name;
const char *progname;
nodir_name = last_dir_separator(argv0); nodir_name = last_dir_separator(argv0);
if (nodir_name) if (nodir_name)
@ -310,27 +311,27 @@ get_progname(const char *argv0)
else else
nodir_name = skip_drive(argv0); nodir_name = skip_drive(argv0);
#if defined(__CYGWIN__) || defined(WIN32) /*
/* strip .exe suffix, regardless of case */ * Make a copy in case argv[0] is modified by ps_status.
if (strlen(nodir_name) > sizeof(EXE) - 1 && * Leaks memory, but called only once.
pg_strcasecmp(nodir_name + strlen(nodir_name)-(sizeof(EXE)-1), EXE) == 0) */
progname = strdup(nodir_name);
if (progname == NULL)
{ {
char *progname; fprintf(stderr, "%s: out of memory\n", nodir_name);
exit(1); /* This could exit the postmaster */
progname = strdup(nodir_name);
if (progname == NULL)
{
fprintf(stderr, "%s: out of memory\n", nodir_name);
exit(1); /* This could exit the postmaster */
}
progname[strlen(progname) - (sizeof(EXE) - 1)] = '\0';
nodir_name = progname;
} }
#if defined(__CYGWIN__) || defined(WIN32)
/* strip ".exe" suffix, regardless of case */
if (strlen(progname) > sizeof(EXE) - 1 &&
pg_strcasecmp(progname + strlen(progname) - (sizeof(EXE) - 1), EXE) == 0)
progname[strlen(progname) - (sizeof(EXE) - 1)] = '\0';
#endif #endif
return nodir_name; return progname;
} }
/* /*
* dir_strcmp: strcmp except any two DIR_SEP characters are considered equal * dir_strcmp: strcmp except any two DIR_SEP characters are considered equal