com php-src: Reverted incorrect changes to setlocale(): ext/standard/string.c
| From: | Dmitry Stogov | Date: | Thu, 16 Nov 2017 15:10:28 +0000 |
| Subject: | com php-src: Reverted incorrect changes to setlocale(): ext/standard/string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-100279@lists.php.net to get a copy of this message | ||
Commit: b8a4225a5f9d2bbe7aeb4cabce659bc903f162f6
Author: Dmitry Stogov <dmitry@zend.com> Thu, 16 Nov 2017 18:10:28 +0300
Parents: 288c1dd6dac133fb7ef573ba9f657ef76d73b536
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b8a4225a5f9d2bbe7aeb4cabce659bc903f162f6
Log:
Reverted incorrect changes to setlocale()
Changed paths:
M ext/standard/string.c
Diff:
diff --git a/ext/standard/string.c b/ext/standard/string.c
index f6c5ea6..9211c4b 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -4484,7 +4484,7 @@ PHP_FUNCTION(setlocale)
{
zval *args = NULL;
zval *plocale;
- zend_string *loc, *tmp_loc;
+ zend_string *loc;
char *retval;
zend_long cat;
int num_args, i = 0;
@@ -4513,15 +4513,15 @@ PHP_FUNCTION(setlocale)
plocale = &args[i];
}
- loc = zval_get_tmp_string(plocale, &tmp_loc);
+ loc = zval_get_string(plocale);
if (!strcmp("0", ZSTR_VAL(loc))) {
- zend_tmp_string_release(tmp_loc);
- tmp_loc = loc = NULL;
+ zend_string_release(loc);
+ loc = NULL;
} else {
if (ZSTR_LEN(loc) >= 255) {
php_error_docref(NULL, E_WARNING, "Specified locale name is too long");
- zend_tmp_string_release(tmp_loc);
+ zend_string_release(loc);
break;
}
}
@@ -4543,17 +4543,19 @@ PHP_FUNCTION(setlocale)
RETURN_STR(BG(locale_string));
} else {
BG(locale_string) = zend_string_init(retval, len, 0);
- zend_tmp_string_release(tmp_loc);
+ zend_string_release(loc);
RETURN_STR_COPY(BG(locale_string));
}
} else if (len == ZSTR_LEN(loc) && !memcmp(ZSTR_VAL(loc), retval, len)) {
RETURN_STR(loc);
}
- zend_tmp_string_release(tmp_loc);
+ zend_string_release(loc);
}
RETURN_STRING(retval);
}
- zend_tmp_string_release(tmp_loc);
+ if (loc) {
+ zend_string_release(loc);
+ }
if (Z_TYPE(args[0]) == IS_ARRAY) {
idx++;