From 2aa100780ff7eda80161f102f3aae977639445e1 Mon Sep 17 00:00:00 2001
From: zhang_xubo <2578876417@qq.com>
Date: Tue, 11 Jul 2023 14:52:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9repl?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=81=9C=E6=AD=A2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E4=BA=A7=E7=94=9Fcore=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/backend/utils/misc/guc/guc_storage.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/common/backend/utils/misc/guc/guc_storage.cpp b/src/common/backend/utils/misc/guc/guc_storage.cpp
index 196b32fb8..0826dc7de 100755
--- a/src/common/backend/utils/misc/guc/guc_storage.cpp
+++ b/src/common/backend/utils/misc/guc/guc_storage.cpp
@@ -5007,8 +5007,6 @@ static int IsReplConnInfoChanged(const char* replConnInfo, const char* newval)
     int repl_length = 0;
     replconninfo* newReplInfo = NULL;
     replconninfo* ReplInfo_1 = t_thrd.postmaster_cxt.ReplConnArray[1];
-    newval = TrimStr(newval);
-    replConnInfo = TrimStr(replConnInfo);
     if (replConnInfo == NULL || newval == NULL) {
         return NO_CHANGE;
     }
@@ -5028,9 +5026,9 @@ static int IsReplConnInfoChanged(const char* replConnInfo, const char* newval)
                 return ADD_REPL_CONN_INFO_WITH_NEW_LOCAL_IP_PORT;
             }
 
-            if (strcmp(ReplInfo_1->localhost, newReplInfo->localhost) != 0 ||
+            if (newReplInfo != NULL && (strcmp(ReplInfo_1->localhost, newReplInfo->localhost) != 0 ||
                 ReplInfo_1->localport != newReplInfo->localport ||
-                ReplInfo_1->localheartbeatport != newReplInfo->localheartbeatport) {
+                ReplInfo_1->localheartbeatport != newReplInfo->localheartbeatport)) {
                 pfree_ext(newReplInfo);
                 pfree_ext(oldReplStr);
                 pfree_ext(newReplStr);