-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
checker: check and error for invalid utf8 string literals (#23721)
- Loading branch information
Showing
8 changed files
with
112 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,90 +1,13 @@ | ||
module utf8 | ||
|
||
struct Utf8State { | ||
mut: | ||
index int | ||
subindex int | ||
failed bool | ||
} | ||
import encoding.utf8.validate as impl | ||
|
||
// validate_str reports if str consists of valid UTF-8 runes | ||
pub fn validate_str(str string) bool { | ||
return validate(str.str, str.len) | ||
return impl.utf8_string(str) | ||
} | ||
|
||
// validate reports if data consists of valid UTF-8 runes | ||
pub fn validate(data &u8, len int) bool { | ||
mut state := Utf8State{} | ||
for i := 0; i < len; i++ { | ||
s := unsafe { data[i] } | ||
if s == 0 { | ||
break | ||
} | ||
state.next_state(s) | ||
if state.failed { | ||
return false | ||
} | ||
} | ||
return !state.failed && state.subindex <= 0 | ||
} | ||
|
||
fn (mut s Utf8State) seq(r0 bool, r1 bool, is_tail bool) bool { | ||
if s.subindex == 0 || (s.index > 1 && s.subindex == 1) || (s.index >= 6 && s.subindex == 2) { | ||
if (s.subindex == 0 && r0) || (s.subindex == 1 && r1) || (s.subindex == 2 && is_tail) { | ||
s.subindex++ | ||
return true | ||
} | ||
} else { | ||
s.failed = true | ||
if is_tail { | ||
s.index = 0 | ||
s.subindex = 0 | ||
s.failed = false | ||
} | ||
return true | ||
} | ||
s.index++ | ||
s.subindex = 0 | ||
return false | ||
} | ||
|
||
fn (mut s Utf8State) next_state(c u8) { | ||
// sequence 1 | ||
if s.index == 0 { | ||
if (c >= 0x00 + 1 && c <= 0x7F) || c == 0x00 { | ||
return | ||
} | ||
s.index++ | ||
s.subindex = 0 | ||
} | ||
is_tail := c >= 0x80 && c <= 0xBF | ||
// sequence 2 | ||
if s.index == 1 && s.seq(c >= 0xC2 && c <= 0xDF, false, is_tail) { | ||
return | ||
} | ||
// sequence 3 | ||
if s.index == 2 && s.seq(c == 0xE0, c >= 0xA0 && c <= 0xBF, is_tail) { | ||
return | ||
} | ||
if s.index == 3 && s.seq(c >= 0xE1 && c <= 0xEC, c >= 0x80 && c <= 0xBF, is_tail) { | ||
return | ||
} | ||
if s.index == 4 && s.seq(c == 0xED, c >= 0x80 && c <= 0x9F, is_tail) { | ||
return | ||
} | ||
if s.index == 5 && s.seq(c >= 0xEE && c <= 0xEF, c >= 0x80 && c <= 0xBF, is_tail) { | ||
return | ||
} | ||
// sequence 4 | ||
if s.index == 6 && s.seq(c == 0xF0, c >= 0x90 && c <= 0xBF, is_tail) { | ||
return | ||
} | ||
if s.index == 7 && s.seq(c >= 0xF1 && c <= 0xF3, c >= 0x80 && c <= 0xBF, is_tail) { | ||
return | ||
} | ||
if s.index == 8 && s.seq(c == 0xF4, c >= 0x80 && c <= 0x8F, is_tail) { | ||
return | ||
} | ||
// we should never reach here | ||
s.failed = true | ||
return impl.utf8_data(data, len) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import encoding.utf8.validate | ||
|
||
fn test_validate_str() { | ||
assert validate.utf8_string('añçá') == true | ||
assert validate.utf8_string('\x61\xC3\xB1\xC3\xA7\xC3\xA1') == true | ||
assert validate.utf8_string('\xC0\xC1') == false | ||
assert validate.utf8_string('\xF5\xFF') == false | ||
assert validate.utf8_string('\xE0\xEF') == false | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
module validate | ||
|
||
struct Utf8State { | ||
mut: | ||
index int | ||
subindex int | ||
failed bool | ||
} | ||
|
||
// utf8_string returns true, if the given string `s` consists only of valid UTF-8 runes | ||
pub fn utf8_string(s string) bool { | ||
return utf8_data(s.str, s.len) | ||
} | ||
|
||
// utf8_data returns true, if the given `data` block, with length `len` bytes, consists only of valid UTF-8 runes | ||
pub fn utf8_data(data &u8, len int) bool { | ||
mut state := Utf8State{} | ||
for i := 0; i < len; i++ { | ||
s := unsafe { data[i] } | ||
if s == 0 { | ||
break | ||
} | ||
state.next_state(s) | ||
if state.failed { | ||
return false | ||
} | ||
} | ||
return !state.failed && state.subindex <= 0 | ||
} | ||
|
||
fn (mut s Utf8State) seq(r0 bool, r1 bool, is_tail bool) bool { | ||
if s.subindex == 0 || (s.index > 1 && s.subindex == 1) || (s.index >= 6 && s.subindex == 2) { | ||
if (s.subindex == 0 && r0) || (s.subindex == 1 && r1) || (s.subindex == 2 && is_tail) { | ||
s.subindex++ | ||
return true | ||
} | ||
} else { | ||
s.failed = true | ||
if is_tail { | ||
s.index = 0 | ||
s.subindex = 0 | ||
s.failed = false | ||
} | ||
return true | ||
} | ||
s.index++ | ||
s.subindex = 0 | ||
return false | ||
} | ||
|
||
fn (mut s Utf8State) next_state(c u8) { | ||
// sequence 1 | ||
if s.index == 0 { | ||
if (c >= 0x00 + 1 && c <= 0x7F) || c == 0x00 { | ||
return | ||
} | ||
s.index++ | ||
s.subindex = 0 | ||
} | ||
is_tail := c >= 0x80 && c <= 0xBF | ||
// sequence 2 | ||
if s.index == 1 && s.seq(c >= 0xC2 && c <= 0xDF, false, is_tail) { | ||
return | ||
} | ||
// sequence 3 | ||
if s.index == 2 && s.seq(c == 0xE0, c >= 0xA0 && c <= 0xBF, is_tail) { | ||
return | ||
} | ||
if s.index == 3 && s.seq(c >= 0xE1 && c <= 0xEC, c >= 0x80 && c <= 0xBF, is_tail) { | ||
return | ||
} | ||
if s.index == 4 && s.seq(c == 0xED, c >= 0x80 && c <= 0x9F, is_tail) { | ||
return | ||
} | ||
if s.index == 5 && s.seq(c >= 0xEE && c <= 0xEF, c >= 0x80 && c <= 0xBF, is_tail) { | ||
return | ||
} | ||
// sequence 4 | ||
if s.index == 6 && s.seq(c == 0xF0, c >= 0x90 && c <= 0xBF, is_tail) { | ||
return | ||
} | ||
if s.index == 7 && s.seq(c >= 0xF1 && c <= 0xF3, c >= 0x80 && c <= 0xBF, is_tail) { | ||
return | ||
} | ||
if s.index == 8 && s.seq(c == 0xF4, c >= 0x80 && c <= 0x8F, is_tail) { | ||
return | ||
} | ||
// we should never reach here | ||
s.failed = true | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
vlib/v/checker/tests/invalid_utf8_string.vv:1:6: warning: invalid utf8 string, please check your file's encoding is utf8 | ||
1 | _ := '����txt' | ||
| ~~~~~~~ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
_ := '����txt' |