com php-src: added check by php_mb_check_forbidden_enco ding: ext/mbstring/mbstring.c
| From: | Yasuo Ohgaki | Date: | Sat, 07 Mar 2015 17:03:44 +0000 |
| Subject: | com php-src: added check by php_mb_check_forbidden_enco ding: ext/mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93720@lists.php.net to get a copy of this message | ||
Commit: 09b5bfc71a7e4199295a48e75ef220aa34376cd5
Author: Masaki Kagaya <masakielastic@gmail.com> Thu, 19 Feb 2015 18:43:55 +0900
Parents: 32383114d540c642222307b1c08535301ea376f2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=09b5bfc71a7e4199295a48e75ef220aa34376cd5
Log:
added check by 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 cc2e8e6..5ef6eca 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -4773,7 +4773,7 @@ static inline char* php_mb_chr(long cp, const char* enc)
supported = true;
}
- if (!supported) {
+ if (!supported || php_mb_check_forbidden_encoding(no_enc)) {
php_error_docref(NULL, E_WARNING, "Unsupported encoding \"%s\"", enc);
return NULL;
}