com php-src: Also check for invalid codepoints in mb_ord( ): ext/mbstring/mbstring.c ext/mbstring/tests/mb_or d.phpt

From: Date: Fri, 04 Aug 2017 11:01:03 +0000
Subject: com php-src: Also check for invalid codepoints in mb_ord( ): ext/mbstring/mbstring.c ext/mbstring/tests/mb_or d.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-98942@lists.php.net to get a copy of this message
Commit: 353f7bf461005895082c440ee6619edf7e2ec8e8 Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 4 Aug 2017 13:00:09 +0200 Parents: e53162a32b011ef22c3e0210e7af334d968f227c Branches: PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=353f7bf461005895082c440ee6619edf7e2ec8e8 Log: Also check for invalid codepoints in mb_ord() And return false in that case, instead of returning 0x3f... Changed paths: M ext/mbstring/mbstring.c M ext/mbstring/tests/mb_ord.phpt Diff: diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 5618d7a..57e4384 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -5074,7 +5074,21 @@ static inline zend_long php_mb_ord(const char* str, size_t str_len, const char* return -1; } - ret = php_mb_convert_encoding(str, str_len, "UCS-4BE", enc, &ret_len); + { + long orig_illegalchars = MBSTRG(illegalchars); + MBSTRG(illegalchars) = 0; + ret = php_mb_convert_encoding(str, str_len, "UCS-4BE", enc, &ret_len); + if (MBSTRG(illegalchars) != 0) { + if (ret) { + efree(ret); + } + MBSTRG(illegalchars) = orig_illegalchars; + return -1; + } + + MBSTRG(illegalchars) = orig_illegalchars; + } + if (ret == NULL) { return -1; } diff --git a/ext/mbstring/tests/mb_ord.phpt b/ext/mbstring/tests/mb_ord.phpt index 4bf0d0c..25249da 100644 --- a/ext/mbstring/tests/mb_ord.phpt +++ b/ext/mbstring/tests/mb_ord.phpt @@ -6,7 +6,7 @@ mb_ord() <?php var_dump( 0x20bb7 === mb_ord("\u{20bb7}"), - 0x3f === mb_ord("\u{d800}"), + false === mb_ord("\u{d800}"), 0x50aa === mb_ord("\x8f\xa1\xef", "EUC-JP-2004") );

« previous php.cvs (#98942) next »