From 869af50fcfdd4448b2dc637d905f1afda689741d Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Wed, 27 Oct 2010 20:03:00 +0300
Subject: [PATCH] Fix long-standing segfault when accept() or one of the calls
 made right after accepting a connection fails, and the server is compiled
 with GSSAPI support. Report and patch by Alexander V. Chernikov, bug #5731.

---
 src/backend/postmaster/postmaster.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 8caa62ad0e..f24a091ef8 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -1975,7 +1975,7 @@ ConnCreate(int serverFd)
 		if (port->sock >= 0)
 			StreamClose(port->sock);
 		ConnFree(port);
-		port = NULL;
+		return NULL;
 	}
 	else
 	{