archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

replace AND operator with OR operator

Browse source
This commit is contained in:
Masaki Kagaya 2015-03-01 16:01:06 +09:00
parent 905dfb9179
commit d24dacc594
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ext/mbstring/mbstring.c
View file

@ -4817,23 +4817,18 @@ static inline char* php_mb_chr(long cp, const char* enc, size_t *output_len)
cp = 0x3f; cp = 0x3f;
} }
} } else if (php_mb_is_no_encoding_utf8(no_enc)) {
if (php_mb_is_no_encoding_utf8(no_enc)) {
if (cp > 0xd7ff && 0xe000 > cp) { if (cp > 0xd7ff && 0xe000 > cp) {
if (php_mb_is_no_encoding_unicode(MBSTRG(current_internal_encoding)->no_encoding)) { if (php_mb_is_no_encoding_unicode(MBSTRG(current_internal_encoding)->no_encoding)) {
if (0xd800 > MBSTRG(current_filter_illegal_substchar) || MBSTRG(current_filter_illegal_substchar) > 0xdfff) {
if (MBSTRG(current_filter_illegal_substchar) > 0xd7ff && 0xe000 > MBSTRG(current_filter_illegal_substchar)) {
cp = 0x3f;
} else {
cp = MBSTRG(current_filter_illegal_substchar); cp = MBSTRG(current_filter_illegal_substchar);
} else {
cp = 0x3f;
} }
} else { } else {
cp = 0x3f; cp = 0x3f;
} }
} }
} }
@ -4854,6 +4849,7 @@ static inline char* php_mb_chr(long cp, const char* enc, size_t *output_len)
} }
return ret; return ret;
} else if (php_mb_is_unsupported_no_encoding(no_enc)) { } else if (php_mb_is_unsupported_no_encoding(no_enc)) {
php_error_docref(NULL, E_WARNING, "Unsupported encoding \"%s\"", enc); php_error_docref(NULL, E_WARNING, "Unsupported encoding \"%s\"", enc);
return NULL; return NULL;