com php-src: Merge branch 'PHP-7.2': ext/mbstring/mbstring.c
| From: | Nikita Popov | Date: | Fri, 04 Aug 2017 11:02:44 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2': ext/mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98943@lists.php.net to get a copy of this message | ||
Commit: 4e4ec31e2e37d67a6ce70e4b1b4981c737b13fb3
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 4 Aug 2017 13:02:44 +0200
Parents: 5caf05f6c53f0d2eb87e248944d1000a3277e12f 353f7bf461005895082c440ee6619edf7e2ec8e8
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e4ec31e2e37d67a6ce70e4b1b4981c737b13fb3
Log:
Merge branch 'PHP-7.2'
Changed paths:
MM ext/mbstring/mbstring.c
Diff:
diff --cc ext/mbstring/mbstring.c
index 57f298e,57e4384..f0132ca
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@@ -4898,7 -5074,20 +4898,20 @@@ static inline zend_long php_mb_ord(cons
return -1;
}
- ret = php_mb_convert_encoding_ex(str, str_len, &mbfl_encoding_ucs4be, enc, &ret_len);
+ {
+ long orig_illegalchars = MBSTRG(illegalchars);
+ MBSTRG(illegalchars) = 0;
- ret = php_mb_convert_encoding(str, str_len, "UCS-4BE", enc, &ret_len);
++ ret = php_mb_convert_encoding_ex(str, str_len, &mbfl_encoding_ucs4be, enc, &ret_len);
+ if (MBSTRG(illegalchars) != 0) {
+ if (ret) {
+ efree(ret);
+ }
+ MBSTRG(illegalchars) = orig_illegalchars;
+ return -1;
+ }
+
+ MBSTRG(illegalchars) = orig_illegalchars;
+ }
if (ret == NULL) {
return -1;