diff options
| author | Tony Cook <tony@develop-help.com> | 2019-09-16 16:38:26 +1000 |
|---|---|---|
| committer | Karl Williamson <khw@cpan.org> | 2019-10-24 12:10:34 -0700 |
| commit | bcb1da5c29c3a2534a0e43874974b83c9c8b174c (patch) | |
| tree | e23fad9b95f04a7d830fd068556267b55a21f862 | |
| parent | 8b64b5d1624be026f0eebe3bf2ddbd0c086a4d49 (diff) | |
| download | perl-bcb1da5c29c3a2534a0e43874974b83c9c8b174c.tar.gz | |
ensure locale_name_on_entry isn't clobbered
If the return value of setlocale() is static storage, the call to
setlocale(LC_NUMERIC, "C"); could overwrite it.
If the return value of setlocale() is malloced, the call to
setlocale(LC_NUMERIC, "C"); could free it.
Either way, we need to copy it. Fixes gh #17054 rt134212
| -rw-r--r-- | t/porting/customized.dat | 2 | ||||
| -rw-r--r-- | vutil.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/t/porting/customized.dat b/t/porting/customized.dat index 35a36b2136..811b8e7030 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -33,4 +33,4 @@ autodie cpan/autodie/t/mkdir.t 9e70d2282a3cc7d76a78bf8144fccba20fb37dac autodie cpan/autodie/t/recv.t 63bea2daa330e44b67714527ddf701c1bf3a6954 experimental cpan/experimental/t/basic.t cb9da8dd05b854375809872a05dd32637508d5da version cpan/version/lib/version.pm 7ef9219d1d5f1d71f08a79f3b0577df138b21b12 -version vutil.c 317c25a807f9503282d58917a4a53b667232a6c5 +version vutil.c 601cc57bbc0070ae33eab7fd2d667f20efbe15f8 @@ -643,6 +643,8 @@ VER_NV: if ( strNE(locale_name_on_entry, "C") && strNE(locale_name_on_entry, "POSIX")) { + /* the setlocale() call might free or overwrite the name */ + locale_name_on_entry = savepv(locale_name_on_entry); setlocale(LC_NUMERIC, "C"); } else { /* This value indicates to the restore code that we didn't @@ -666,6 +668,8 @@ VER_NV: if ( strNE(locale_name_on_entry, "C") && strNE(locale_name_on_entry, "POSIX")) { + /* the setlocale() call might free or overwrite the name */ + locale_name_on_entry = savepv(locale_name_on_entry); setlocale(LC_NUMERIC, "C"); } else { /* This value indicates to the restore code that we @@ -715,6 +719,7 @@ VER_NV: if (locale_name_on_entry) { setlocale(LC_NUMERIC, locale_name_on_entry); + Safefree(locale_name_on_entry); } LC_NUMERIC_UNLOCK; /* End critical section */ @@ -723,6 +728,7 @@ VER_NV: if (locale_name_on_entry) { setlocale(LC_NUMERIC, locale_name_on_entry); + Safefree(locale_name_on_entry); LC_NUMERIC_UNLOCK; } else if (locale_obj_on_entry == PL_underlying_numeric_obj) { |