Reject invalid record sizes and return malformed-input errors
Validate payload sizes before record/header writes and make header packing return io::Result when the total size overflows the format limit. Return located parse errors for invalid UTF-8 and timestamp year overflow. Validate cell timestamps consistently in full reads, selected reads, and hierarchy scans while retaining scan behavior for skipped text geometry. Add regression coverage for preserved writer outputs, padded metadata sizes, malformed strings, timestamp boundaries, bounded errors, and Python bindings. Document the fallible header packing API. Validation: all 97 Rust tests pass in debug and release; all 16 Python tests pass against the rebuilt native library.
This commit is contained in:
parent
df62677f5c
commit
31afef0529
4 changed files with 307 additions and 28 deletions
21
src/basic.rs
21
src/basic.rs
|
|
@ -79,12 +79,23 @@ pub fn parse_real8(input: &[u8]) -> IResult<'_, f64> {
|
|||
|
||||
pub fn parse_datetime(input: &[u8]) -> IResult<'_, [i16; 6]> {
|
||||
let mut buf = [0_i16; 6];
|
||||
let mut input = input;
|
||||
for bb in &mut buf {
|
||||
(input, *bb) = parse_int2(input)?;
|
||||
let (mut remaining, year) = parse_int2(input)?;
|
||||
let Some(year) = year.checked_add(1900) else {
|
||||
return fail(
|
||||
input,
|
||||
"Timestamp year exceeds the Int16 range after adding 1900".to_string(),
|
||||
);
|
||||
};
|
||||
buf[0] = year;
|
||||
for bb in &mut buf[1..] {
|
||||
(remaining, *bb) = parse_int2(remaining)?;
|
||||
}
|
||||
buf[0] += 1900; // Year is from 1900
|
||||
Ok((input, buf))
|
||||
Ok((remaining, buf))
|
||||
}
|
||||
|
||||
pub(crate) fn decode_utf8(bytes: Vec<u8>) -> Result<String, ErrType> {
|
||||
String::from_utf8(bytes)
|
||||
.map_err(|error| ErrType::Failed(format!("Invalid UTF-8 string: {}", error.utf8_error())))
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ use crate::records::{
|
|||
|
||||
use crate::records;
|
||||
use crate::record::{RecordHeader, Record};
|
||||
use crate::basic::{IResult, fail, take_bytes};
|
||||
use crate::basic::{IResult, decode_utf8, fail, take_bytes};
|
||||
|
||||
use std::string::String;
|
||||
use std::collections::HashMap;
|
||||
|
|
@ -784,7 +784,7 @@ fn read_text<'a>(
|
|||
xy_builder.append_value(xy);
|
||||
|
||||
let (input, string_bytes) = STRING::read(input)?;
|
||||
let string = String::from_utf8(string_bytes).unwrap();
|
||||
let string = decode_utf8(string_bytes).map_err(|error| (input, error))?;
|
||||
let string_builder = text_builder.field_builder::<StringBuilder>(10).unwrap();
|
||||
string_builder.append_value(string);
|
||||
|
||||
|
|
@ -856,7 +856,7 @@ fn read_ref<'a>(
|
|||
let mut colrow = None;
|
||||
|
||||
let (input, struct_name_bytes) = SNAME::skip_and_read(input)?;
|
||||
let struct_name = String::from_utf8(struct_name_bytes).unwrap();
|
||||
let struct_name = decode_utf8(struct_name_bytes).map_err(|error| (input, error))?;
|
||||
let next_id = names.len();
|
||||
let id = names.entry(struct_name).or_insert(next_id.try_into().unwrap());
|
||||
|
||||
|
|
@ -986,7 +986,7 @@ fn walk_properties<'a>(
|
|||
|
||||
on_property(PropertyRecord {
|
||||
key,
|
||||
value: String::from_utf8(value_bytes).unwrap(),
|
||||
value: decode_utf8(value_bytes).map_err(|error| (input, error))?,
|
||||
});
|
||||
}
|
||||
(input, header) = RecordHeader::read(input)?;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ use std::io::Write;
|
|||
use crate::record::{RecordHeader, Record};
|
||||
use crate::records;
|
||||
use crate::elements::{read_elements, scan_elements, DListBuilder, FListBuilder, ScanRefRecord};
|
||||
use crate::basic::{IResult, OResult, take_bytes, fail};
|
||||
use crate::basic::{ErrType, IResult, OResult, decode_utf8, take_bytes, fail};
|
||||
|
||||
use std::string::String;
|
||||
use std::collections::HashMap;
|
||||
|
|
@ -324,13 +324,14 @@ fn make_scan_builder() -> StructBuilder {
|
|||
fn append_file_header(
|
||||
lib_builder: &mut StructBuilder,
|
||||
header: &FileHeader,
|
||||
) {
|
||||
) -> Result<(), ErrType> {
|
||||
let name = decode_utf8(header.name.clone())?;
|
||||
let dbu_builder = lib_builder.field_builder::<Float64Builder>(0).unwrap();
|
||||
dbu_builder.append_value(header.meters_per_db_unit);
|
||||
let uu_builder = lib_builder.field_builder::<Float64Builder>(1).unwrap();
|
||||
uu_builder.append_value(header.user_units_per_db_unit);
|
||||
let libname_builder = lib_builder.field_builder::<StringBuilder>(2).unwrap();
|
||||
libname_builder.append_value(String::from_utf8(header.name.clone()).unwrap());
|
||||
libname_builder.append_value(name);
|
||||
let mtl_builder = lib_builder.field_builder::<FListBuilder>(3).unwrap();
|
||||
let mt_builder = mtl_builder.values().as_any_mut().downcast_mut::<Int16Builder>().unwrap();
|
||||
mt_builder.append_values(&header.mod_time, &[true; 6]);
|
||||
|
|
@ -339,6 +340,7 @@ fn append_file_header(
|
|||
let at_builder = atl_builder.values().as_any_mut().downcast_mut::<Int16Builder>().unwrap();
|
||||
at_builder.append_values(&header.acc_time, &[true; 6]);
|
||||
atl_builder.append(true);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -441,14 +443,16 @@ where
|
|||
let (mut input, mut header) = RecordHeader::read(input)?;
|
||||
while header.tag != records::RTAG_ENDLIB {
|
||||
let record_start = base_offset + input_size - input.len() - 4;
|
||||
(input, _) = take_bytes(input, header.data_size)?;
|
||||
if header.tag == records::RTAG_BGNSTR {
|
||||
(input, _) = records::BGNSTR::read_data(input, header.data_size)?;
|
||||
let name_bytes;
|
||||
(input, name_bytes) = records::STRNAME::read(input)?;
|
||||
let name = String::from_utf8(name_bytes).unwrap();
|
||||
let name = decode_utf8(name_bytes).map_err(|error| (input, error))?;
|
||||
let id = intern_name(names, name);
|
||||
let (next_input, ()) = on_struct(input, record_start, id, names)?;
|
||||
input = next_input;
|
||||
} else {
|
||||
(input, _) = take_bytes(input, header.data_size)?;
|
||||
}
|
||||
(input, header) = RecordHeader::read(input)?;
|
||||
}
|
||||
|
|
@ -461,7 +465,7 @@ pub fn read_library(input: &[u8]) -> IResult<'_, StructArray> {
|
|||
let mut lib_builder = make_library_builder();
|
||||
|
||||
let (input, header) = FileHeader::read(input)?;
|
||||
append_file_header(&mut lib_builder, &header);
|
||||
append_file_header(&mut lib_builder, &header).map_err(|error| (input, error))?;
|
||||
let base_offset = full_input_size - input.len();
|
||||
|
||||
let mut names = HashMap::<String, u32>::new();
|
||||
|
|
@ -497,7 +501,7 @@ pub fn scan_library(input: &[u8]) -> IResult<'_, StructArray> {
|
|||
let mut lib_builder = make_scan_builder();
|
||||
|
||||
let (input, header) = FileHeader::read(input)?;
|
||||
append_file_header(&mut lib_builder, &header);
|
||||
append_file_header(&mut lib_builder, &header).map_err(|error| (input, error))?;
|
||||
let base_offset = full_input_size - input.len();
|
||||
|
||||
let mut names = HashMap::<String, u32>::new();
|
||||
|
|
@ -541,8 +545,8 @@ pub fn scan_library(input: &[u8]) -> IResult<'_, StructArray> {
|
|||
/// as its remainder; it does not advance a sequential parsing cursor.
|
||||
pub fn read_selected_library<'a>(input: &'a [u8], ranges: &[(u64, u64)]) -> IResult<'a, StructArray> {
|
||||
let mut lib_builder = make_library_builder();
|
||||
let (_, header) = FileHeader::read(input)?;
|
||||
append_file_header(&mut lib_builder, &header);
|
||||
let (header_end, header) = FileHeader::read(input)?;
|
||||
append_file_header(&mut lib_builder, &header).map_err(|error| (header_end, error))?;
|
||||
|
||||
let mut names = HashMap::<String, u32>::new();
|
||||
let mut layers = HashMap::<u32, u32>::new();
|
||||
|
|
@ -558,7 +562,7 @@ pub fn read_selected_library<'a>(input: &'a [u8], ranges: &[(u64, u64)]) -> IRes
|
|||
let struct_input = &input[start..end];
|
||||
let (struct_input, _) = records::BGNSTR::read(struct_input)?;
|
||||
let (struct_input, name_bytes) = records::STRNAME::read(struct_input)?;
|
||||
let name = String::from_utf8(name_bytes).unwrap();
|
||||
let name = decode_utf8(name_bytes).map_err(|error| (struct_input, error))?;
|
||||
let file_offset = end - struct_input.len();
|
||||
|
||||
let id = intern_name(&mut names, name);
|
||||
|
|
|
|||
|
|
@ -27,15 +27,16 @@ impl RecordHeader {
|
|||
Ok((input, RecordHeader{tag, data_size}))
|
||||
}
|
||||
|
||||
pub fn pack_into(&self) -> [u8; 4] {
|
||||
let size = self.data_size.checked_add(4).expect("Record too big!");
|
||||
pub fn pack_into(&self) -> io::Result<[u8; 4]> {
|
||||
let size = self.data_size.checked_add(4)
|
||||
.ok_or_else(|| io::Error::new(io::ErrorKind::InvalidInput, "Record longer than max size (u16)"))?;
|
||||
let [size_hi, size_lo] = size.to_be_bytes();
|
||||
let [tag_hi, tag_lo] = self.tag.to_be_bytes();
|
||||
[size_hi, size_lo, tag_hi, tag_lo]
|
||||
Ok([size_hi, size_lo, tag_hi, tag_lo])
|
||||
}
|
||||
|
||||
pub fn write<W: Write>(&self, ww: &mut W) -> OResult {
|
||||
let bytes = self.pack_into();
|
||||
let bytes = self.pack_into()?;
|
||||
ww.write_all(&bytes)?;
|
||||
Ok(bytes.len())
|
||||
}
|
||||
|
|
@ -69,6 +70,8 @@ pub trait Record<RData: RecordData> {
|
|||
}
|
||||
|
||||
fn write_header<W: Write>(ww: &mut W, data_size: u16) -> OResult {
|
||||
Self::check_size(data_size)
|
||||
.map_err(|message| io::Error::new(io::ErrorKind::InvalidInput, message))?;
|
||||
RecordHeader{tag: Self::tag(), data_size}.write(ww)
|
||||
}
|
||||
|
||||
|
|
@ -126,9 +129,8 @@ pub trait Record<RData: RecordData> {
|
|||
fn write<W: Write>(ww: &mut W, data: &RData::InData) -> OResult {
|
||||
let packed_data = RData::pack(data);
|
||||
let data_bytes = packed_data.as_ref();
|
||||
let len = u16::try_from(data_bytes.len()).ok()
|
||||
.filter(|len| *len <= u16::MAX - 4)
|
||||
.ok_or_else(|| io::Error::new(io::ErrorKind::InvalidInput, "Record longer than max size (u16)"))?;
|
||||
let len = u16::try_from(data_bytes.len())
|
||||
.map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "Record longer than max size (u16)"))?;
|
||||
Self::write_header(ww, len)?;
|
||||
ww.write_all(data_bytes)?;
|
||||
Ok(usize::from(len) + 4)
|
||||
|
|
|
|||
Loading…
Reference in a new issue