From: Chet Ramey Date: Wed, 5 Oct 2022 14:41:16 +0000 (-0400) Subject: Readline-8.2 patch 1: fix crash when readline is started with an invalid locale speci... X-Git-Tag: readline-8.3-alpha~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7274faabe97ce53d6b464272d7e6ab6c1392837b;p=thirdparty%2Freadline.git Readline-8.2 patch 1: fix crash when readline is started with an invalid locale specification --- diff --git a/._.gitignore b/._.gitignore deleted file mode 100644 index aa90ec6..0000000 Binary files a/._.gitignore and /dev/null differ 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