libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: /proc/locales: use ENCODING_LEN to define array sizes 

Fixes: c42b98bdc6 ("Cygwin: introduce /proc/codesets and /proc/locales")
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2023-03-26 12:52:32 +02:00
parent 4e578fad79
commit 68aea16d3f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
winsup/cygwin/fhandler/proc.cc
View File

@ -2114,15 +2114,15 @@ static BOOL
format_proc_locale_proc (LPWSTR win_locale, DWORD info, LPARAM param) format_proc_locale_proc (LPWSTR win_locale, DWORD info, LPARAM param)
{ {
char **bufptr_p = (char **) param; char **bufptr_p = (char **) param;
wchar_t iso15924_postfix[32] = { 0 }; wchar_t iso15924_postfix[ENCODING_LEN + 1] = { 0 };
wchar_t iso15924[32] = { 0 }; wchar_t iso15924[ENCODING_LEN + 1] = { 0 };
wchar_t iso3166[32] = { 0 }; wchar_t iso3166[ENCODING_LEN + 1] = { 0 };
wchar_t iso639[32] = { 0 }; wchar_t iso639[ENCODING_LEN + 1] = { 0 };
wchar_t currency[9] = { 0 }; wchar_t currency[9] = { 0 };
char modifier[32] = { 0 }; char modifier[ENCODING_LEN + 1] = { 0 };
char posix_loc[32]; char posix_loc[ENCODING_LEN + 1];
char posix_loc_and_modifier[32]; char posix_loc_and_modifier[ENCODING_LEN + 1];
char codeset[32]; char codeset[ENCODING_LEN + 1];
wchar_t *cp; wchar_t *cp;
/* Skip language-only locales, e. g. "en" */ /* Skip language-only locales, e. g. "en" */
@ -2207,15 +2207,15 @@ format_proc_locale_proc (LPWSTR win_locale, DWORD info, LPARAM param)
add it as modifier if possible, or skip it */ add it as modifier if possible, or skip it */
else if (iso15924[0]) else if (iso15924[0])
{ {
wchar_t scriptless_win_locale[32]; wchar_t scriptless_win_locale[ENCODING_LEN + 1];
wchar_t default_iso15924[32]; wchar_t default_iso15924[ENCODING_LEN + 1];
wcpcpy (wcpcpy (wcpcpy (scriptless_win_locale, iso639), L"-"), wcpcpy (wcpcpy (wcpcpy (scriptless_win_locale, iso639), L"-"),
iso3166); iso3166);
if ((GetLocaleInfoEx (scriptless_win_locale, LOCALE_SSCRIPTS, if ((GetLocaleInfoEx (scriptless_win_locale, LOCALE_SSCRIPTS,
default_iso15924, 32) default_iso15924, ENCODING_LEN + 1)
|| GetLocaleInfoEx (iso639, LOCALE_SSCRIPTS, || GetLocaleInfoEx (iso639, LOCALE_SSCRIPTS,
default_iso15924, 32)) default_iso15924, ENCODING_LEN + 1))
&& !wcsstr (default_iso15924, iso15924)) && !wcsstr (default_iso15924, iso15924))
{ {
if (!wcscmp (iso15924, L"Latn;")) if (!wcscmp (iso15924, L"Latn;"))