Skip to content

fix: No UTF-8 validation happening when portable is disabled #445

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
EmilyMatt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: No UTF-8 validation happening when portable is disabled #445

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
23 changes: 22 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,27 @@ impl<'de> Deserializer<'de> {

/// architecture dependant `find_structural_bits`
impl Deserializer<'_> {
#[cfg_attr(not(feature = "no-inline"), inline)]
/// Native fallback that pre-validates UTF-8 before finding structural bits,
/// since the native `ChunkedUtf8ValidatorImp` is a no-op.
#[cfg(all(
feature = "runtime-detection",
any(target_arch = "x86_64", target_arch = "x86"),
not(feature = "portable"),
))]
pub(crate) unsafe fn find_structural_bits_native(
input: &[u8],
structural_indexes: &mut Vec<u32>,
) -> std::result::Result<(), ErrorType> {
match core::str::from_utf8(input) {
Ok(_) => (),
Err(_) => return Err(ErrorType::InvalidUtf8),
};
unsafe {
Self::_find_structural_bits::<impls::native::SimdInput>(input, structural_indexes)
}
}

#[cfg_attr(not(feature = "no-inline"), inline)]
#[cfg(all(
feature = "runtime-detection",
Expand All @@ -629,7 +650,7 @@ impl Deserializer<'_> {
#[cfg(feature = "portable")]
let r = Deserializer::_find_structural_bits::<impls::portable::SimdInput>;
#[cfg(not(feature = "portable"))]
let r = Deserializer::_find_structural_bits::<impls::native::SimdInput>;
let r = Deserializer::find_structural_bits_native;
r
}
}
Expand Down