Merge branch 'main' into cp_CVE_2023_5870

Author: reshke

gpMgmt/bin/gpstart

@@ -902,9 +902,7 @@ class GpStart:
 
         if is_external_fts:
             if options.fts_hosts is None:
-                coordinator_data_directory = os.getenv('COORDINATOR_DATA_DIRECTORY')
-                if coordinator_data_directory is None:
-                    coordinator_data_directory = options.coordinatorDataDirectory
+                coordinator_data_directory = gp.get_coordinatordatadir()
                 options.fts_hosts = coordinator_data_directory + '/config' + '/fts_host'
 
         return GpStart(options.specialMode, options.restricted,

gpMgmt/bin/gpstop

@@ -959,9 +959,7 @@ class GpStop:
 
         if is_external_fts:
             if options.fts_hosts is None:
-                coordinator_data_directory = os.getenv('COORDINATOR_DATA_DIRECTORY')
-                if coordinator_data_directory is None:
-                    coordinator_data_directory = options.coordinatorDataDirectory
+                coordinator_data_directory = gp.get_coordinatordatadir()
 
                 options.fts_hosts = coordinator_data_directory + '/config' + '/fts_host'
 

src/bin/pg_upgrade/pg_upgrade.c

@@ -371,9 +371,7 @@ get_cluster_version(ClusterInfo *cluster)
 
 	PQfinish(conn);
 
-	stop_postmaster(cluster);
-
-	return;
+	stop_postmaster(false);
 }
 
 #ifdef WIN32

src/interfaces/libpq/fe-secure-gssapi.c

@@ -585,6 +585,8 @@ pqsecure_open_gss(PGconn *conn)
 
 			PqGSSRecvLength += ret;
 
+			Assert(PqGSSRecvLength < PQ_GSS_RECV_BUFFER_SIZE);
+			PqGSSRecvBuffer[PqGSSRecvLength] = '\0';
 			appendPQExpBuffer(&conn->errorMessage, "%s\n", PqGSSRecvBuffer + 1);
 
 			return PGRES_POLLING_FAILED;