Commit9a94629

committed

Don't dump core if pq_comm_reset() is called before pq_init().

This can happen if an error occurs in a standalone backend. This bugwas introduced by commit2bd9e41.Reported by Álvaro Herrera.

1 parent5ede3a3 commit9a94629Copy full SHA for 9a94629

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,6 @@ char *Unix_socket_group;`
`105`	`105`	`/* Where the Unix socket files are (list of palloc'd strings) */`
`106`	`106`	`staticList*sock_paths=NIL;`
`107`	`107`
`108`		`-PQcommMethods*PqCommMethods;`
`109`		`-`
`110`		`-`
`111`	`108`	`/*`
`112`	`109`	`* Buffers for low-level I/O.`
`113`	`110`	`*`
`@@ -154,8 +151,6 @@ static intLock_AF_UNIX(char unixSocketDir, char unixSocketPath);`
`154`	`151`	`staticintSetup_AF_UNIX(char*sock_path);`
`155`	`152`	`#endif/* HAVE_UNIX_SOCKETS */`
`156`	`153`
`157`		`-PQcommMethodsPQcommSocketMethods;`
`158`		`-`
`159`	`154`	`staticPQcommMethodsPqCommSocketMethods= {`
`160`	`155`	`socket_comm_reset,`
`161`	`156`	`socket_flush,`
`@@ -167,6 +162,9 @@ static PQcommMethods PqCommSocketMethods = {`
`167`	`162`	`socket_endcopyout`
`168`	`163`	`};`
`169`	`164`
	`165`	`+PQcommMethods*PqCommMethods=&PqCommSocketMethods;`
	`166`	`+`
	`167`	`+`
`170`	`168`
`171`	`169`	`/* --------------------------------`
`172`	`170`	`*pq_init - initialize libpq at backend startup`
`@@ -175,7 +173,6 @@ static PQcommMethods PqCommSocketMethods = {`
`175`	`173`	`void`
`176`	`174`	`pq_init(void)`
`177`	`175`	`{`
`178`		`-PqCommMethods=&PqCommSocketMethods;`
`179`	`176`	`PqSendBufferSize=PQ_SEND_BUFFER_SIZE;`
`180`	`177`	`PqSendBuffer=MemoryContextAlloc(TopMemoryContext,PqSendBufferSize);`
`181`	`178`	`PqSendPointer=PqSendStart=PqRecvPointer=PqRecvLength=0;`

Comments

(0)