Commit cb49f31
committed
deps: cherry-pick libuv/libuv@d09441c
Original commit message:
fs: fix WTF-8 decoding issue (#4092)
We forgot to mask off the high bits from the first byte, so we ended up
always failing the subsequent range check.
Refs: libuv/libuv#2970
Fixes: #48673
PR-URL: #51976
Refs: #48673
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Ulises Gascón <ulisesgascongonzalez@gmail.com>1 parent ea50540 commit cb49f31
1 file changed
Lines changed: 3 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -176,9 +176,11 @@ static int32_t fs__decode_wtf8_char(const char** input) { | |||
| 176 | 176 | if ((b4 & 0xC0) != 0x80) | |
| 177 | 177 | return -1; /* invalid: not a continuation byte */ | |
| 178 | 178 | code_point = (code_point << 6) | (b4 & 0x3F); | |
| 179 | - if (b1 <= 0xF4) | ||
| 179 | + if (b1 <= 0xF4) { | ||
| 180 | + code_point &= 0x1FFFFF; | ||
| 180 | 181 | if (code_point <= 0x10FFFF) | |
| 181 | 182 | return code_point; /* four-byte character */ | |
| 183 | + } | ||
| 182 | 184 | ||
| 183 | 185 | /* code point too large */ | |
| 184 | 186 | return -1; | |
0 commit comments