From c6ebce34481ade007ddf74dc57a8058278921dfd Mon Sep 17 00:00:00 2001
From: chenxiaobin19 <1025221611@qq.com>
Date: Thu, 26 Sep 2024 09:56:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=87=E5=AE=9A=E9=9D=9E?=
 =?UTF-8?q?=E6=B3=95locale=E7=9A=84=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=EF=BC=88cherry=20picked=20commit=20from?=
 =?UTF-8?q?=20<gitee.com//opengauss/openGauss-server/commit/ade2570c4e1a3f?=
 =?UTF-8?q?2a086f30b011bf5f1021088933>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/port/chklocale.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/port/chklocale.cpp b/src/common/port/chklocale.cpp
index ff79e4d0e..1e2222d1f 100644
--- a/src/common/port/chklocale.cpp
+++ b/src/common/port/chklocale.cpp
@@ -420,9 +420,11 @@ char* gs_perm_setlocale_r(int category, const char* locale)
         else
             category_mask = (1 << (unsigned int)category);
 
-        t_thrd.port_cxt.save_locale_r = newlocale(category_mask, locale, t_thrd.port_cxt.save_locale_r);
-        if (t_thrd.port_cxt.save_locale_r == (locale_t)0)
+        locale_t newLocale = newlocale(category_mask, locale, t_thrd.port_cxt.save_locale_r);
+        if (newLocale == (locale_t)0) {
             return NULL;
+        }
+        t_thrd.port_cxt.save_locale_r = newLocale;
         old_locale = uselocale(t_thrd.port_cxt.save_locale_r);
         if (old_locale == (locale_t)0)
             return NULL;