2023-03-22 17:25:38 +01:00
|
|
|
From b8d91eab12603fa88e095248855f5f772d182d05 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Chet Ramey <chet.ramey@case.edu>
|
|
|
|
|
Date: Wed, 5 Oct 2022 10:41:16 -0400
|
|
|
|
|
Subject: [PATCH] Readline-8.2 patch 1: fix crash when readline is started with
|
|
|
|
|
an invalid locale specification
|
|
|
|
|
|
2023-04-24 21:01:08 +02:00
|
|
|
Upstream: https://git.savannah.gnu.org/cgit/readline.git/patch/?id=7274faabe97ce53d6b464272d7e6ab6c1392837b
|
|
|
|
|
[peter: stripped unrelated ._.gitignore change]
|
2023-03-22 17:25:38 +01:00
|
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
|
|
|
---
|
|
|
|
|
nls.c | 4 ++++
|
|
|
|
|
patchlevel | 2 +-
|
|
|
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/nls.c b/nls.c
|
|
|
|
|
index 5c6a13b..8c027d6 100644
|
|
|
|
|
--- a/nls.c
|
|
|
|
|
+++ b/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 b/patchlevel
|
|
|
|
|
index d8c9df7..fdf4740 100644
|
|
|
|
|
--- a/patchlevel
|
|
|
|
|
+++ b/patchlevel
|
|
|
|
|
@@ -1,3 +1,3 @@
|
|
|
|
|
# Do not edit -- exists only for use by patch
|
|
|
|
|
|
|
|
|
|
-0
|
|
|
|
|
+1
|
|
|
|
|
--
|
|
|
|
|
2.39.2
|
|
|
|
|
|
