com php-src: added check for forbidden encodings: ext/mbstring/mbstring.c

From: Date: Thu, 19 Feb 2015 05:37:12 +0000
Subject: com php-src: added check for forbidden encodings: ext/mbstring/mbstring.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-96526@lists.php.net to get a copy of this message
Commit: ec4f74b29684933f62230db6341389f9d5388d63 Author: Masaki Kagaya <masakielastic@gmail.com> Thu, 19 Feb 2015 14:37:12 +0900 Parents: b06595675476cbce391390a35d8ae3ac9ad83c4c Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ec4f74b29684933f62230db6341389f9d5388d63 Log: added check for forbidden encodings Changed paths: M ext/mbstring/mbstring.c Diff: diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index b44d475...9c62b06 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -4622,6 +4622,32 @@ static inline long php_mb_ord(const char* str, size_t str_len, const char* enc) || no_enc == mbfl_no_encoding_utf32le ) { supported = true; + } 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 + ) { + supported = false; } if (!supported) {

« previous php.cvs (#96526) next »