Skip to content

Match binascii hex separator validation #9643

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

Merged
youknowone merged 1 commit into from
Nov 7, 2026
Merged

Match binascii hex separator validation #9643

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
4 changes: 2 additions & 2 deletions crates/common/src/binascii.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ const fn unhex_nibble(c: u8) -> Option<u8> {
}
}

/// `b2a_hex` / `hexlify`. `sep` is the (already validated, length-1 ASCII)
/// separator byte, or `None` for no separator.
/// `b2a_hex` / `hexlify`. `sep` is the already validated separator byte,
/// or `None` for no separator.
#[must_use]
pub fn hexlify(bytes: &[u8], sep: Option<u8>, bytes_per_sep: isize) -> Vec<u8> {
// If no separator or bytes_per_sep is 0, use simple hexlify
Expand Down
35 changes: 24 additions & 11 deletions crates/stdlib/src/binascii.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ mod decl {
use super::{base_n, new_binascii_error};
use crate::vm::{
AsObject, Py, PyObjectRef, PyRef, PyResult, VirtualMachine,
builtins::{PyBytes, PyBytesRef, PyDict, PyModule, PyTypeRef},
builtins::{PyBytes, PyBytesRef, PyDict, PyModule, PyStr, PyTypeRef},
function::{
ArgAsciiBuffer, ArgBytesLike, ArgIndex, ArgIntoBool, ItemDoc, OptionalArg, PyMethodDef,
PyMethodFlags,
Expand Down Expand Up @@ -161,7 +161,7 @@ mod decl {
#[pyarg(any)]
data: ArgBytesLike,
#[pyarg(any, optional)]
sep: OptionalArg<ArgAsciiBuffer>,
sep: OptionalArg<PyObjectRef>,

@youknowone youknowone Nov 6, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check this change is necessary after #9563

#[pyarg(any, optional)]
bytes_per_sep: OptionalArg<isize>,
}
Expand All @@ -174,20 +174,33 @@ mod decl {
sep,
bytes_per_sep,
} = args;
let sep = match sep {
OptionalArg::Present(sep) => sep.with_ref(|sep| {
let [sep] = sep else {
let sep_byte = match &sep {
OptionalArg::Present(sep) => {
if sep.length(vm)? != 1 {
return Err(vm.new_value_error("sep must be length 1."));
};
if !sep.is_ascii() {
return Err(vm.new_value_error("sep must be ASCII."));
}
Ok(Some(*sep))
})?,
let byte = if let Some(string) = sep.downcast_ref::<PyStr>() {
if string.kind().is_ascii() {
string.as_bytes().first().copied().unwrap_or_default()
} else {
let mut chars = string.as_wtf8().code_points();
let first = chars.next().map_or(0, |ch| ch.to_u32());
if first > u8::MAX as u32 || chars.any(|ch| ch.to_u32() > u8::MAX as u32) {
return Err(vm.new_value_error("sep must be ASCII."));
}
first as u8
}
} else if let Some(bytes) = sep.downcast_ref::<PyBytes>() {
bytes.as_bytes().first().copied().unwrap_or_default()
} else {
return Err(vm.new_type_error("sep must be str or bytes."));
};
Some(byte)
}
OptionalArg::Missing => None,
};
let bytes_per_sep = bytes_per_sep.unwrap_or(1);
Ok(data.with_ref(|bytes| binascii::hexlify(bytes, sep, bytes_per_sep)))
Ok(data.with_ref(|bytes| binascii::hexlify(bytes, sep_byte, bytes_per_sep)))
}

#[derive(FromArgs)]
Expand Down
Loading