Validate GDSII record sizes through one fallible path

Route every record read through size validation and report malformed payloads
as parse errors instead of panicking. Apply metadata size constraints through
the Record trait, hide Arrow reader internals, and remove unused wrappers and
scratch code.

Add coverage for direct, skipped, and payload reads, truncated buffers, and
FFI error offsets.
This commit is contained in:
Jan Petykiewicz 2026-11-16 20:44:48 -08:00
commit 54aa757678

View file

@ -4,7 +4,6 @@
///
use crate::records::{
//BOX, BOUNDARY, NODE, PATH, TEXT, SREF, AREF,
DATATYPE, PATHTYPE, BOXTYPE, NODETYPE, TEXTTYPE,
LAYER, XY, WIDTH, COLROW, PRESENTATION, STRING,
STRANS, MAG, ANGLE, PROPATTR, PROPVALUE,
@ -13,11 +12,10 @@ use crate::records::{
use crate::records;
use crate::record::{RecordHeader, Record};
use crate::basic::{IResult, fail, take_bytes}; //OResult
use crate::basic::{IResult, fail, take_bytes};
use std::string::String;
use std::collections::HashMap;
//use std::io::Write;
use arrow_array::builder::{
StructBuilder, FixedSizeListBuilder, ListBuilder, StringBuilder, ArrayBuilder, BooleanBuilder,
@ -25,8 +23,8 @@ use arrow_array::builder::{
};
pub type DListBuilder = ListBuilder<Box<dyn ArrayBuilder>>;
pub type FListBuilder = FixedSizeListBuilder<Box<dyn ArrayBuilder>>;
pub(crate) type DListBuilder = ListBuilder<Box<dyn ArrayBuilder>>;
pub(crate) type FListBuilder = FixedSizeListBuilder<Box<dyn ArrayBuilder>>;
struct PropertyRecord {
key: i16,
@ -72,15 +70,15 @@ struct ARefRecord {
}
#[derive(Clone)]
pub struct ScanRefRecord {
pub target_id: u32,
pub invert_y: bool,
pub scale: f64,
pub angle_rad: f64,
pub xy: u64,
pub xy0: u64,
pub xy1: u64,
pub counts: u32,
pub(crate) struct ScanRefRecord {
pub(crate) target_id: u32,
pub(crate) invert_y: bool,
pub(crate) scale: f64,
pub(crate) angle_rad: f64,
pub(crate) xy: u64,
pub(crate) xy0: u64,
pub(crate) xy1: u64,
pub(crate) counts: u32,
}
enum RefRecord {
@ -117,7 +115,7 @@ fn insert_layer(
}
pub fn read_elements<'a>(
pub(crate) fn read_elements<'a>(
input: &'a [u8],
cell_builder: &mut StructBuilder,
names: &mut HashMap<String, u32>,
@ -293,7 +291,7 @@ pub fn read_elements<'a>(
}
pub fn scan_elements<'a>(
pub(crate) fn scan_elements<'a>(
input: &'a [u8],
names: &mut HashMap<String, u32>,
) -> IResult<'a, Vec<ScanRefRecord>> {
@ -583,7 +581,7 @@ fn append_boundary_prop(
}
pub fn read_path<'a>(
fn read_path<'a>(
input: &'a [u8],
cell_builder: &mut StructBuilder,
layers: &mut HashMap<u32, u32>,
@ -654,7 +652,7 @@ pub fn read_path<'a>(
Ok((input, ()))
}
pub fn read_boxnode<'a>(
fn read_boxnode<'a>(
input: &'a [u8],
cell_builder: &mut StructBuilder,
tag: u16,
@ -698,7 +696,7 @@ pub fn read_boxnode<'a>(
Ok((input, ()))
}
pub fn read_text<'a>(
fn read_text<'a>(
input: &'a [u8],
cell_builder: &mut StructBuilder,
layers: &mut HashMap<u32, u32>,
@ -967,7 +965,7 @@ fn read_ref<'a>(
/// Preserves record order and duplicate property attributes.
/// Stops reading after consuming ENDEL record.
///
pub fn read_properties<'a>(input: &'a [u8], props_builder: &mut DListBuilder) -> IResult<'a, ()> {
fn read_properties<'a>(input: &'a [u8], props_builder: &mut DListBuilder) -> IResult<'a, ()> {
let (input, ()) = walk_properties(input, |property| append_property(props_builder, property))?;
props_builder.append(true);
Ok((input, ()))