From 6ae57df70b2a4e3db50f1d9eec70ae0fb5a7fb2d Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 22 Jan 2015 16:55:20 +0800 Subject: [PATCH] Revert "Fixed valgrind reported issue with setlocale" This reverts commit fa06343d7e0e04f4a660218f6dbb7ce18c3f090b. --- ext/standard/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index 6d5b1f223e..dc69a8a3ac 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); -- 2.40.0