diff options
| -rw-r--r-- | newlib/libc/locale/newlocale.c | 3 | ||||
| -rw-r--r-- | winsup/cygwin/release/3.3.6 | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/newlib/libc/locale/newlocale.c b/newlib/libc/locale/newlocale.c index 0789d5fd9..08f29dbcc 100644 --- a/newlib/libc/locale/newlocale.c +++ b/newlib/libc/locale/newlocale.c @@ -188,7 +188,8 @@ _newlocale_r (struct _reent *p, int category_mask, const char *locale, if (tmp_locale.lc_cat[i].buf == (const void *) -1) { tmp_locale.lc_cat[i].buf = base->lc_cat[i].buf; - base->lc_cat[i].ptr = base->lc_cat[i].buf = NULL; + if (base != __get_C_locale ()) + base->lc_cat[i].ptr = base->lc_cat[i].buf = NULL; } #endif /* __HAVE_LOCALE_INFO__ */ _freelocale_r (p, base); diff --git a/winsup/cygwin/release/3.3.6 b/winsup/cygwin/release/3.3.6 index 364e0cb0d..1da4fa26c 100644 --- a/winsup/cygwin/release/3.3.6 +++ b/winsup/cygwin/release/3.3.6 @@ -39,3 +39,6 @@ Bug Fixes - Fix a path handling bug that could cause a non-existing file to be treated as the current directory. Addresses: https://cygwin.com/pipermail/cygwin/2022-August/252030.html + +- Fix a crash in newlocale. + Addresses: https://cygwin.com/pipermail/cygwin/2022-August/252043.html |