com php-src: Revert "Fixed valgrind reported issue with setlocale": ext/standard/string.c
| From: | Xinchen Hui | Date: | Thu, 22 Jan 2015 08:55:20 +0000 |
| Subject: | com php-src: Revert "Fixed valgrind reported issue with setlocale": ext/standard/string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84302@lists.php.net to get a copy of this message | ||
Commit: 6ae57df70b2a4e3db50f1d9eec70ae0fb5a7fb2d
Author: Xinchen Hui <laruence@php.net> Thu, 22 Jan 2015 16:55:20 +0800
Parents: 201f660ae11488eeacd16ee7adbe79fc8a28e27d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6ae57df70b2a4e3db50f1d9eec70ae0fb5a7fb2d
Log:
Revert "Fixed valgrind reported issue with setlocale"
This reverts commit fa06343d7e0e04f4a660218f6dbb7ce18c3f090b.
Changed paths:
M ext/standard/string.c
Diff:
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 6d5b1f2..dc69a8a 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -4550,7 +4550,7 @@ PHP_FUNCTION(setlocale)
}
if (len == loc->len && !memcmp(loc->val, retval, len)) {
BG(locale_string) = zend_string_copy(loc);
- RETURN_STR(zend_string_copy(BG(locale_string)));
+ RETURN_STR(BG(locale_string));
} else {
BG(locale_string) = zend_string_init(retval, len, 0);
zend_string_release(loc);