com php-src: added php_mb_check_forbidden_encoding: ext/mbstring/mbstring.c
| From: | Joe Watkins | Date: | Thu, 19 Feb 2015 06:13:17 +0000 |
| Subject: | com php-src: added php_mb_check_forbidden_encoding: ext/mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96523@lists.php.net to get a copy of this message | ||
Commit: a0890c7c59674623fdf4422fd2b6fa74090e9c8a
Author: Masaki Kagaya <masakielastic@gmail.com> Thu, 19 Feb 2015 15:13:17 +0900
Parents: b9b47c84a0d637c3a9b4d4e828b38361c1ba834e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a0890c7c59674623fdf4422fd2b6fa74090e9c8a
Log:
added php_mb_check_forbidden_encoding
Changed paths:
M ext/mbstring/mbstring.c
Diff:
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 55dc1d6..6e68731 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -4591,6 +4591,39 @@ PHP_FUNCTION(mb_check_encoding)
}
/* }}} */
+static inline zend_bool php_mb_check_forbidden_encoding(enum mbfl_no_encoding no_enc)
+{
+ if (no_enc == mbfl_no_encoding_pass
+ || no_enc == mbfl_no_encoding_auto
+ || no_enc == mbfl_no_encoding_wchar
+ || no_enc == mbfl_no_encoding_byte2be
+ || no_enc == mbfl_no_encoding_byte2le
+ || no_enc == mbfl_no_encoding_byte4be
+ || no_enc == mbfl_no_encoding_byte4le
+ || no_enc == mbfl_no_encoding_base64
+ || no_enc == mbfl_no_encoding_uuencode
+ || no_enc == mbfl_no_encoding_html_ent
+ || no_enc == mbfl_no_encoding_qprint
+ || no_enc == mbfl_no_encoding_utf7
+ || no_enc == mbfl_no_encoding_utf7imap
+ || no_enc == mbfl_no_encoding_2022kr
+ || no_enc == mbfl_no_encoding_jis
+ || no_enc == mbfl_no_encoding_2022jp
+ || no_enc == mbfl_no_encoding_2022jpms
+ || no_enc == mbfl_no_encoding_jis_ms
+ || no_enc == mbfl_no_encoding_2022jp_2004
+ || no_enc == mbfl_no_encoding_2022jp_kddi
+ || no_enc == mbfl_no_encoding_cp50220
+ || no_enc == mbfl_no_encoding_cp50220raw
+ || no_enc == mbfl_no_encoding_cp50221
+ || no_enc == mbfl_no_encoding_cp50222
+ ) {
+ 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;
@@ -4641,31 +4674,7 @@ static inline long php_mb_ord(const char* str, size_t str_len, const char*
enc)
(unsigned char) ret[2] << 8 |
(unsigned char) ret[3];
- } else if (no_enc == mbfl_no_encoding_pass
- || no_enc == mbfl_no_encoding_auto
- || no_enc == mbfl_no_encoding_wchar
- || no_enc == mbfl_no_encoding_byte2be
- || no_enc == mbfl_no_encoding_byte2le
- || no_enc == mbfl_no_encoding_byte4be
- || no_enc == mbfl_no_encoding_byte4le
- || no_enc == mbfl_no_encoding_base64
- || no_enc == mbfl_no_encoding_uuencode
- || no_enc == mbfl_no_encoding_html_ent
- || no_enc == mbfl_no_encoding_qprint
- || no_enc == mbfl_no_encoding_utf7
- || no_enc == mbfl_no_encoding_utf7imap
- || no_enc == mbfl_no_encoding_2022kr
- || no_enc == mbfl_no_encoding_jis
- || no_enc == mbfl_no_encoding_2022jp
- || no_enc == mbfl_no_encoding_2022jpms
- || no_enc == mbfl_no_encoding_jis_ms
- || no_enc == mbfl_no_encoding_2022jp_2004
- || no_enc == mbfl_no_encoding_2022jp_kddi
- || no_enc == mbfl_no_encoding_cp50220
- || no_enc == mbfl_no_encoding_cp50220raw
- || no_enc == mbfl_no_encoding_cp50221
- || no_enc == mbfl_no_encoding_cp50222
- ) {
+ } else if (php_mb_check_forbidden_encoding(no_enc)) {
php_error_docref(NULL, E_WARNING, "Unsupported encoding \"%s\"", enc);
return -1;
}