Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-09 22:49:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

cformat.rs: reject %c args > 255 when byte formatting

Browse Source 
This matches CPython's behaviour.  Thanks to @DimitrisJim for the
improved implementation here.
This commit is contained in:
Daniel Watkins
2021-10-29 08:56:44 -04:00
parent 1ed3a6ca81
commit 4d2747e4b8
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vm/src/cformat.rs
View File

@@ -440,12 +440,9 @@ impl CFormatSpec {
CFormatType::Character => {
if let Some(i) = obj.payload::<PyInt>() {
let ch = i
.as_bigint()
.to_u32()
.and_then(std::char::from_u32)
.ok_or_else(|| {
vm.new_overflow_error("%c arg not in range(0x110000)".to_owned())
})?;
.try_to_primitive::<u8>(vm)
.map_err(|_| vm.new_overflow_error("%c arg not in range(256)".to_owned()))?
as char;
return Ok(self.format_char(ch).into_bytes());
}
if let Some(b) = obj.payload::<PyBytes>() {