Proxmox-Port/proxmox
1
0
Fork 0
forked from proxmox-mirrors/proxmox
Code Pull Requests Activity

schema: fix pointer/length confusion in str_slice_to_range

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2025-01-13 15:22:07 +01:00
parent 62e105a34e
commit 8c5fa1c562
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
proxmox-schema/src/de/cow3.rs
View File

@ -153,17 +153,15 @@ impl<'o, 'i> Cow3<'o, 'i, str> {
} }
pub fn str_slice_to_range(original: &str, slice: &str) -> Option<Range<usize>> { pub fn str_slice_to_range(original: &str, slice: &str) -> Option<Range<usize>> {
let bytes = original.as_bytes(); let orig_addr = original.as_ptr() as usize;
let slice_addr = slice.as_ptr() as usize;
let orig_addr = bytes.as_ptr() as usize;
let slice_addr = slice.as_bytes().as_ptr() as usize;
let offset = slice_addr.checked_sub(orig_addr)?; let offset = slice_addr.checked_sub(orig_addr)?;
if offset > orig_addr + bytes.len() { if offset > original.len() {
return None; return None;
} }
let end = offset + slice.as_bytes().len(); let end = offset + slice.len();
if end > orig_addr + bytes.len() { if end > original.len() {
return None; return None;
} }