com php-src: add php_mb_check_unicode_encoding: ext /mbstring/mbstring.c
| From: | Yasuo Ohgaki | Date: | Sat, 07 Mar 2015 17:03:45 +0000 |
| Subject: | com php-src: add php_mb_check_unicode_encoding: ext /mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93708@lists.php.net to get a copy of this message | ||
Commit: 1033bad01ec8d599082c3ddeb6ba4c54faf1b26b
Author: Masaki Kagaya <masakielastic@gmail.com> Sat, 21 Feb 2015 19:19:40 +0900
Parents: 00324a379c80c5f6eb69f1c53331de92d75ca1e8
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1033bad01ec8d599082c3ddeb6ba4c54faf1b26b
Log:
add php_mb_check_unicode_encoding
Changed paths:
M ext/mbstring/mbstring.c
Diff:
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index d0dc42c..a2ec16f 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -4623,6 +4623,32 @@ static inline zend_bool php_mb_check_unsupported_encoding(enum
mbfl_no_encoding
return false;
}
+static inline zend_bool php_mb_check_unicode_encoding(enum mbfl_no_encoding no_enc)
+{
+ if (no_enc == mbfl_no_encoding_utf8
+ || no_enc == mbfl_no_encoding_utf8_docomo
+ || no_enc == mbfl_no_encoding_utf8_kddi_a
+ || no_enc == mbfl_no_encoding_utf8_kddi_b
+ || no_enc == mbfl_no_encoding_utf8_sb
+ || no_enc == mbfl_no_encoding_ucs4
+ || no_enc == mbfl_no_encoding_ucs4be
+ || no_enc == mbfl_no_encoding_ucs4le
+ || no_enc == mbfl_no_encoding_utf32
+ || no_enc == mbfl_no_encoding_utf32be
+ || no_enc == mbfl_no_encoding_utf32le
+ || no_enc == mbfl_no_encoding_ucs2
+ || no_enc == mbfl_no_encoding_ucs2be
+ || no_enc == mbfl_no_encoding_ucs2le
+ || no_enc == mbfl_no_encoding_utf16
+ || no_enc == mbfl_no_encoding_utf16be
+ || no_enc == mbfl_no_encoding_utf16le
+ ) {
+ return true;
+ }
+
+ return false;
+}
+
static inline long php_mb_ord(const char* str, size_t str_len, const char* enc)
{
enum mbfl_no_encoding no_enc;
@@ -4643,24 +4669,7 @@ static inline long php_mb_ord(const char* str, size_t str_len, const char*
enc)
}
}
- if (no_enc == mbfl_no_encoding_utf8
- || no_enc == mbfl_no_encoding_utf8_docomo
- || no_enc == mbfl_no_encoding_utf8_kddi_a
- || no_enc == mbfl_no_encoding_utf8_kddi_b
- || no_enc == mbfl_no_encoding_utf8_sb
- || no_enc == mbfl_no_encoding_ucs4
- || no_enc == mbfl_no_encoding_ucs4be
- || no_enc == mbfl_no_encoding_ucs4le
- || no_enc == mbfl_no_encoding_utf32
- || no_enc == mbfl_no_encoding_utf32be
- || no_enc == mbfl_no_encoding_utf32le
- || no_enc == mbfl_no_encoding_ucs2
- || no_enc == mbfl_no_encoding_ucs2be
- || no_enc == mbfl_no_encoding_ucs2le
- || no_enc == mbfl_no_encoding_utf16
- || no_enc == mbfl_no_encoding_utf16be
- || no_enc == mbfl_no_encoding_utf16le
- ) {
+ if (php_mb_check_unicode_encoding(no_enc)) {
ret = php_mb_convert_encoding(str, str_len, "UCS-4BE", enc, &ret_len);
@@ -4752,30 +4761,39 @@ static inline char* php_mb_chr(long cp, const char* enc)
}
}
- if (no_enc == mbfl_no_encoding_utf8
+ if (php_mb_check_unicode_encoding(no_enc)) {
+
+ if (0 > cp || 0x10ffff < cp) {
+
+ if (php_mb_check_unicode_encoding(MBSTRG(current_internal_encoding)->no_encoding)) {
+ cp = MBSTRG(current_filter_illegal_substchar);
+ } else {
+ cp = 0x3f;
+ }
+
+ }
+
+ if (no_enc == mbfl_no_encoding_utf8
|| no_enc == mbfl_no_encoding_utf8_docomo
|| no_enc == mbfl_no_encoding_utf8_kddi_a
|| no_enc == mbfl_no_encoding_utf8_kddi_b
|| no_enc == mbfl_no_encoding_utf8_sb
- || no_enc == mbfl_no_encoding_ucs4
- || no_enc == mbfl_no_encoding_ucs4be
- || no_enc == mbfl_no_encoding_ucs4le
- || no_enc == mbfl_no_encoding_utf32
- || no_enc == mbfl_no_encoding_utf32be
- || no_enc == mbfl_no_encoding_utf32le
- || no_enc == mbfl_no_encoding_ucs2
- || no_enc == mbfl_no_encoding_ucs2be
- || no_enc == mbfl_no_encoding_ucs2le
- || no_enc == mbfl_no_encoding_utf16
- || no_enc == mbfl_no_encoding_utf16be
- || no_enc == mbfl_no_encoding_utf16le
- ) {
+ ) {
+ if (cp > 0xd7ff && 0xe000 > cp) {
+
+ if (php_mb_check_unicode_encoding(MBSTRG(current_internal_encoding)->no_encoding)) {
+ if (MBSTRG(current_filter_illegal_substchar) > 0xd7ff &&
+ 0xe000 > MBSTRG(current_filter_illegal_substchar)
+ ) {
+ cp = 0x3f;
+ } else {
+ cp = MBSTRG(current_filter_illegal_substchar);
+ }
+
+ } else {
+ cp = 0x3f;
+ }
- if (0 > cp || (cp > 0xd7ff && 0xe000 > cp) || 0x10ffff < cp) {
- if (no_enc == MBSTRG(current_internal_encoding)->no_encoding) {
- cp = MBSTRG(current_filter_illegal_substchar);
- } else {
- cp = 0x3f;
}
}