From 7274faabe97ce53d6b464272d7e6ab6c1392837b Mon Sep 17 00:00:00 2001 From: Chet Ramey 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 --- ._.gitignore | Bin 4096 -> 0 bytes nls.c | 4 ++++ patchlevel | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) delete mode 100644 ._.gitignore diff --git a/._.gitignore b/._.gitignore deleted file mode 100644 index aa90ec6a3ae9c65cd74a34d5269b43c2db7cf089..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 4096 zc-muN6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIR=8jF(f32ziLq_ zLF;+Ya8uBVFrfUo6K9w^Ri{l6X>1J=@)m03 zS-Ql>e)E)~{N@i!9<2D_a=EESKY6iRB!U=)mk!3`Lp7!2e>GBS%5ic*X7ON)|I v71HvHvK2D(N>cMmGV}8ib8;#ba#GVu6q0fh^Rhwx;9=)~xUdX^-2eXoUI<~S 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.47.2