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

Simplify code for converting UTF-8

Browse source 
An overly complex boolean test was used to check if a 3-byte code unit
was valid. Convert it to an equivalent test with fewer terms.
This commit is contained in:
Alex Dowad 2022-04-23 22:07:12 +02:00
parent 85690ae26d
commit dc1ba61d09
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/mbstring/libmbfl/filters/mbfilter_utf8.c
View file

@ -240,7 +240,7 @@ static size_t mb_utf8_to_wchar(unsigned char **in, size_t *in_len, uint32_t *buf
if ((e - p) >= 2) {
unsigned char c2 = *p++;
unsigned char c3 = *p++;
if ((c2 & 0xC0) != 0x80 || !((c2 >= 0x80 && c2 <= 0xBF) && ((c == 0xE0 && c2 >= 0xA0) || (c == 0xED && c2 < 0xA0) || (c > 0xE0 && c != 0xED)))) {
if ((c2 & 0xC0) != 0x80 || (c == 0xE0 && c2 < 0xA0) || (c == 0xED && c2 >= 0xA0)) {
*out++ = MBFL_BAD_INPUT;
p -= 2;
} else if ((c3 & 0xC0) != 0x80) {
@ -285,7 +285,7 @@ static size_t mb_utf8_to_wchar(unsigned char **in, size_t *in_len, uint32_t *buf
*out++ = MBFL_BAD_INPUT;
if (p < e) {
unsigned char c2 = *p;
if ((c == 0xF0 && c2 >= 0x90) || (c == 0xF4 && c2 < 0x90) || c == 0xF2 || c == 0xF3) {
if ((c == 0xF0 && c2 >= 0x90) || (c == 0xF4 && c2 < 0x90)) {
while (p < e && (*p & 0xC0) == 0x80) {
p++;
}