From: Chet Ramey <chet.ramey@case.edu>
Date: Wed, 5 Oct 2022 14:37:38 +0000 (-0400)
Subject: Bash-5.2 patch 2: fix crash in readline when started with an invalid locale specification
X-Git-Tag: bash-5.3-alpha~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a99d905216cc0aac5de0c3050f4afc54e21c6bc5;p=thirdparty%2Fbash.git

Bash-5.2 patch 2: fix crash in readline when started with an invalid locale specification
---

diff --git a/lib/readline/nls.c b/lib/readline/nls.c
index 5c6a13b6e..8c027d6be 100644
--- a/lib/readline/nls.c
+++ b/lib/readline/nls.c
@@ -141,6 +141,10 @@ _rl_init_locale (void)
   if (lspec == 0)
     lspec = "";
   ret = setlocale (LC_CTYPE, lspec);	/* ok, since it does not change locale */
+  if (ret == 0 || *ret == 0)
+    ret = setlocale (LC_CTYPE, (char *)NULL);
+  if (ret == 0 || *ret == 0)
+    ret = RL_DEFAULT_LOCALE;
 #else
   ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec;
 #endif
diff --git a/patchlevel.h b/patchlevel.h
index c0dbb500d..d465c2443 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 1
+#define PATCHLEVEL 2
 
 #endif /* _PATCHLEVEL_H_ */