com php-src: changed the position of calling php_mb_check _forbidden_encoding: ext/mbstring/mbstring.c

From: Date: Sat, 07 Mar 2015 17:03:44 +0000
Subject: com php-src: changed the position of calling php_mb_check _forbidden_encoding: ext/mbstring/mbstring.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93717@lists.php.net to get a copy of this message
Commit: 2e97d7be3b1048a699afc31292b0316082becca7 Author: Masaki Kagaya <masakielastic@gmail.com> Thu, 19 Feb 2015 19:16:14 +0900 Parents: 08443b2bab312f8cc292541bab6b444211c8a977 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2e97d7be3b1048a699afc31292b0316082becca7 Log: changed the position of calling 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 4d014af..ce692ae 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -4678,7 +4678,7 @@ static inline long php_mb_ord(const char* str, size_t str_len, const char* enc) return cp; } else if (php_mb_check_forbidden_encoding(no_enc)) { - php_error_docref(NULL, E_WARNING, "Unsupported encoding \"%s\"", enc); + php_error_docref(NULL, E_WARNING, "Unsupported encoding \"%s\"", enc); return -1; } @@ -4752,11 +4752,6 @@ static inline char* php_mb_chr(long cp, const char* enc) } } - if (php_mb_check_forbidden_encoding(no_enc)) { - php_error_docref(NULL, E_WARNING, "Unsupported encoding \"%s\"", enc); - return NULL; - } - if (no_enc == mbfl_no_encoding_utf8 || no_enc == mbfl_no_encoding_utf8_docomo || no_enc == mbfl_no_encoding_utf8_kddi_a @@ -4795,6 +4790,9 @@ static inline char* php_mb_chr(long cp, const char* enc) zend_string_release(buf); return ret; + } else if (php_mb_check_forbidden_encoding(no_enc)) { + php_error_docref(NULL, E_WARNING, "Unsupported encoding \"%s\"", enc); + return NULL; } if (0 > cp || cp > 0x100000000) { @@ -4832,7 +4830,7 @@ static inline char* php_mb_chr(long cp, const char* enc) ret = php_mb_convert_encoding(buf->val, buf->len, enc, enc, &ret_len); zend_string_release(buf); - return ret; + return ret; } /* {{{ proto bool mb_ord([int cp[, string encoding]]) */ PHP_FUNCTION(mb_chr)

« previous php.cvs (#93717) next »