diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-12-19 18:00:16 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-12-19 18:00:16 +0300 |
| commit | 4514ba016ff158cd113deef1a215fcdcb6913b48 (patch) | |
| tree | e6620ce3b55ae6bfcbfbc3386ef39e013b0487bd /ext/standard/basic_functions.c | |
| parent | 92655be7cf10f7551ee1a1ae7ea0f1bdcfa2ca6b (diff) | |
| download | php-git-4514ba016ff158cd113deef1a215fcdcb6913b48.tar.gz | |
Improved setlocale(). Eliminated locale comparison in ext/pcre if it's not necessary.
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 7cae46f29b..cef9c6d967 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3760,9 +3760,7 @@ PHP_RSHUTDOWN_FUNCTION(basic) /* {{{ */ setlocale(LC_ALL, "C"); setlocale(LC_CTYPE, ""); zend_update_current_locale(); - } - if (BG(locale_string)) { - efree(BG(locale_string)); + zend_string_release(BG(locale_string)); BG(locale_string) = NULL; } |