From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Tue, 11 Apr 2006 22:08:40 +0000 (+0300)
Subject: locale.c: more Safefree() (Coverity finding)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=56279a21118d1d29a1b0c13e8567361057bbd7f9;p=p5sagit%2Fp5-mst-13.2.git

locale.c: more Safefree() (Coverity finding)
Message-Id: <200604111908.k3BJ8ewn030950@kosh.hut.fi>
Date: Tue, 11 Apr 2006 22:08:40 +0300 (EEST)

p4raw-id: //depot/perl@27769
---

diff --git a/locale.c b/locale.c
index f9b2c93..9acacb1 100644
--- a/locale.c
+++ b/locale.c
@@ -284,6 +284,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
     }
     if (!setlocale_failure) {
 #ifdef USE_LOCALE_CTYPE
+	Safefree(curctype);
 	if (! (curctype =
 	       setlocale(LC_CTYPE,
 			 (!done && (lang || PerlEnv_getenv("LC_CTYPE")))
@@ -293,6 +294,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
 	    curctype = savepv(curctype);
 #endif /* USE_LOCALE_CTYPE */
 #ifdef USE_LOCALE_COLLATE
+	Safefree(curcoll);
 	if (! (curcoll =
 	       setlocale(LC_COLLATE,
 			 (!done && (lang || PerlEnv_getenv("LC_COLLATE")))
@@ -302,6 +304,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
 	    curcoll = savepv(curcoll);
 #endif /* USE_LOCALE_COLLATE */
 #ifdef USE_LOCALE_NUMERIC
+	Safefree(curnum);
 	if (! (curnum =
 	       setlocale(LC_NUMERIC,
 			 (!done && (lang || PerlEnv_getenv("LC_NUMERIC")))
@@ -458,12 +461,15 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
 #endif /* ! LC_ALL */
 
 #ifdef USE_LOCALE_CTYPE
+	Safefree(curctype);
 	curctype = savepv(setlocale(LC_CTYPE, NULL));
 #endif /* USE_LOCALE_CTYPE */
 #ifdef USE_LOCALE_COLLATE
+	Safefree(curcoll);
 	curcoll = savepv(setlocale(LC_COLLATE, NULL));
 #endif /* USE_LOCALE_COLLATE */
 #ifdef USE_LOCALE_NUMERIC
+	Safefree(curnum);
 	curnum = savepv(setlocale(LC_NUMERIC, NULL));
 #endif /* USE_LOCALE_NUMERIC */
     }