Skip to content

Fix invalid UTF-8 handling in vendored SQLite parser #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tszymczyszyn-shopify wants to merge 1 commit into
base: v0.9.30-shopify-patches
Choose a base branch
from
Open

Fix invalid UTF-8 handling in vendored SQLite parser #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendored/sqlite3-parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "libsql-sqlite3-parser"
version = "0.13.0"
version = "0.13.1"
edition = "2021"
authors = ["gwenn"]
description = "SQL parser (as understood by SQLite) (libsql fork)"
Expand Down
12 changes: 11 additions & 1 deletion vendored/sqlite3-parser/src/dialect/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ impl TokenType {
}

fn from_bytes(bytes: &[u8]) -> String {
unsafe { str::from_utf8_unchecked(bytes).to_owned() }
String::from_utf8_lossy(bytes).to_string()
}

include!(concat!(env!("OUT_DIR"), "/keywords.rs"));
Expand Down Expand Up @@ -403,3 +403,13 @@ impl TokenType {
}
}
}

#[cfg(test)]
mod tests {
use super::from_bytes;

#[test]
fn converts_invalid_utf8_lossily() {
assert_eq!(from_bytes(&[0xC0, 0x80]), "��");
}
}
Loading