(Retracted by #8261). (Unsuccessful memory access tweaks.)

p4raw-id: //depot/perl@8261

1 files changed, 8 insertions, 6 deletions

diff --git a/util.c b/util.c
index 0dd9fad2c3..d089df4e69 100644
--- a/util.c
+++ b/util.c
@@ -533,7 +533,7 @@ Perl_new_collate(pTHX_ char *newcoll)
 
     if (! newcoll) {
 	if (PL_collation_name) {
-	    ++PL_collation_ix;
+	    PL_collation_ix++;
 	    Safefree(PL_collation_name);
 	    PL_collation_name = NULL;
 	}
@@ -544,9 +544,10 @@ Perl_new_collate(pTHX_ char *newcoll)
     }
 
     if (! PL_collation_name || strNE(PL_collation_name, newcoll)) {
-	++PL_collation_ix;
-	Safefree(PL_collation_name);
-	PL_collation_name = stdize_locale(savepv(newcoll));
+	PL_collation_ix++;
+	if (PL_collation_name)
+	    Safefree(PL_collation_name);
+	PL_collation_name = stdize_locale(newcoll);
 	PL_collation_standard = (strEQ(newcoll, "C") || strEQ(newcoll, "POSIX"));
 
 	{
@@ -605,8 +606,9 @@ Perl_new_numeric(pTHX_ char *newnum)
     }
 
     if (! PL_numeric_name || strNE(PL_numeric_name, newnum)) {
-	Safefree(PL_numeric_name);
-	PL_numeric_name = stdize_locale(savepv(newnum));
+	if (PL_numeric_name)
+	    Safefree(PL_numeric_name);
+	PL_numeric_name = stdize_locale(newnum);
 	PL_numeric_standard = (strEQ(newnum, "C") || strEQ(newnum, "POSIX"));
 	PL_numeric_local = TRUE;
 	set_numeric_radix();