rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More paranoia about global variables containing references to long- 

since-closed file descriptors...
This commit is contained in:
Tom Lane 2000-05-26 01:38:08 +00:00
parent 2af53f3762
commit d4e27596cf
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.142 2000/05/24 00:14:25 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.143 2000/05/26 01:38:08 tgl Exp $
* *
* NOTES * NOTES
* *
@ -1280,7 +1280,6 @@ ConnCreate(int serverFd)
{ {
Port *port; Port *port;
if (!(port = (Port *) calloc(1, sizeof(Port)))) if (!(port = (Port *) calloc(1, sizeof(Port))))
{ {
fprintf(stderr, "%s: ConnCreate: malloc failed\n", fprintf(stderr, "%s: ConnCreate: malloc failed\n",
@ -1292,7 +1291,7 @@ ConnCreate(int serverFd)
if (StreamConnection(serverFd, port) != STATUS_OK) if (StreamConnection(serverFd, port) != STATUS_OK)
{ {
StreamClose(port->sock); StreamClose(port->sock);
free(port); ConnFree(port);
port = NULL; port = NULL;
} }
else else
@ -1306,7 +1305,7 @@ ConnCreate(int serverFd)
} }
/* /*
* ConnFree -- cree a local connection data structure * ConnFree -- free a local connection data structure
*/ */
static void static void
ConnFree(Port *conn) ConnFree(Port *conn)
@ -1891,8 +1890,10 @@ DoBackend(Port *port)
/* Close the postmaster sockets */ /* Close the postmaster sockets */
if (NetServer) if (NetServer)
StreamClose(ServerSock_INET); StreamClose(ServerSock_INET);
ServerSock_INET = INVALID_SOCK;
#if !defined(__CYGWIN32__) && !defined(__QNX__) #if !defined(__CYGWIN32__) && !defined(__QNX__)
StreamClose(ServerSock_UNIX); StreamClose(ServerSock_UNIX);
ServerSock_UNIX = INVALID_SOCK;
#endif #endif
/* Save port etc. for ps status */ /* Save port etc. for ps status */
@ -2024,10 +2025,13 @@ ExitPostmaster(int status)
*/ */
if (ServerSock_INET != INVALID_SOCK) if (ServerSock_INET != INVALID_SOCK)
StreamClose(ServerSock_INET); StreamClose(ServerSock_INET);
ServerSock_INET = INVALID_SOCK;
#if !defined(__CYGWIN32__) && !defined(__QNX__) #if !defined(__CYGWIN32__) && !defined(__QNX__)
if (ServerSock_UNIX != INVALID_SOCK) if (ServerSock_UNIX != INVALID_SOCK)
StreamClose(ServerSock_UNIX); StreamClose(ServerSock_UNIX);
ServerSock_UNIX = INVALID_SOCK;
#endif #endif
proc_exit(status); proc_exit(status);
} }
@ -2190,11 +2194,15 @@ SSDataBase(bool startup)
char nbbuf[ARGV_SIZE]; char nbbuf[ARGV_SIZE];
char dbbuf[ARGV_SIZE]; char dbbuf[ARGV_SIZE];
/* Lose the postmaster's on-exit routines and port connections */
on_exit_reset(); on_exit_reset();
if (NetServer) if (NetServer)
StreamClose(ServerSock_INET); StreamClose(ServerSock_INET);
ServerSock_INET = INVALID_SOCK;
#if !defined(__CYGWIN32__) && !defined(__QNX__) #if !defined(__CYGWIN32__) && !defined(__QNX__)
StreamClose(ServerSock_UNIX); StreamClose(ServerSock_UNIX);
ServerSock_UNIX = INVALID_SOCK;
#endif #endif
StrNCpy(execbuf, Execfile, MAXPGPATH); StrNCpy(execbuf, Execfile, MAXPGPATH);