fix(writer): serialize complete records with correctly sized buffers
Include record headers in wire lengths, allocate initialized array and padded string buffers, and handle empty strings. Write all bytes to short writers and reject oversized records before writing.
This commit is contained in:
parent
aa2132dc6e
commit
3783320f82
2 changed files with 106 additions and 15 deletions
|
|
@ -98,8 +98,7 @@ pub fn parse_bitarray(input: &[u8]) -> IResult<'_, [bool; 16]> {
|
|||
pub fn parse_ascii(input: &[u8], length: u16) -> IResult<'_, Vec<u8>> {
|
||||
let length = length as usize;
|
||||
let (input, data) = take_bytes(input, length)?;
|
||||
let last = data[length - 1];
|
||||
let true_length = if last == 0 { length - 1 } else { length };
|
||||
let true_length = length - usize::from(data.last() == Some(&0));
|
||||
let vec = data[..true_length].to_vec();
|
||||
Ok((input, vec))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
///
|
||||
/// Generic record-level read/write functionality.
|
||||
///
|
||||
use std::io::Write;
|
||||
use std::convert::TryInto;
|
||||
use std::io::{self, Write};
|
||||
use byteorder::{ByteOrder, BigEndian};
|
||||
|
||||
|
||||
|
|
@ -34,8 +33,8 @@ impl RecordHeader {
|
|||
}
|
||||
|
||||
pub fn pack_into(&self) -> [u8; 4] {
|
||||
assert!(self.data_size < 0xffff - 4, "Record too big!");
|
||||
let vals = [self.data_size, self.tag];
|
||||
let size = self.data_size.checked_add(4).expect("Record too big!");
|
||||
let vals = [size, self.tag];
|
||||
let mut buf = [0x77; 4];
|
||||
BigEndian::write_u16_into(&vals, &mut buf);
|
||||
buf
|
||||
|
|
@ -43,7 +42,8 @@ impl RecordHeader {
|
|||
|
||||
pub fn write<W: Write>(&self, ww: &mut W) -> OResult {
|
||||
let bytes = self.pack_into();
|
||||
ww.write(&bytes)
|
||||
ww.write_all(&bytes)?;
|
||||
Ok(bytes.len())
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -141,11 +141,12 @@ 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 = data_bytes.len().try_into().expect("Record longer than max size (u16)!");
|
||||
let mut size = 0;
|
||||
size += Self::write_header(ww, len)?;
|
||||
size += ww.write(data_bytes)?;
|
||||
Ok(size)
|
||||
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)"))?;
|
||||
Self::write_header(ww, len)?;
|
||||
ww.write_all(data_bytes)?;
|
||||
Ok(usize::from(len) + 4)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -235,7 +236,7 @@ impl RecordData for Int2Array {
|
|||
}
|
||||
|
||||
fn pack(data: &Self::InData) -> Self::ByteData {
|
||||
let mut buf = Vec::with_capacity(data.len() * 2);
|
||||
let mut buf = vec![0; data.len() * 2];
|
||||
Self::pack_into(&mut buf, data);
|
||||
buf
|
||||
}
|
||||
|
|
@ -276,7 +277,7 @@ impl RecordData for Int4Array {
|
|||
}
|
||||
|
||||
fn pack(data: &Self::InData) -> Self::ByteData {
|
||||
let mut buf = Vec::with_capacity(data.len() * 4);
|
||||
let mut buf = vec![0; data.len() * 4];
|
||||
Self::pack_into(&mut buf, data);
|
||||
buf
|
||||
}
|
||||
|
|
@ -366,7 +367,7 @@ impl RecordData for ASCII {
|
|||
}
|
||||
|
||||
fn pack(data: &Self::InData) -> Self::ByteData {
|
||||
let mut buf = Vec::with_capacity(data.len() * 4);
|
||||
let mut buf = vec![0; data.len() + data.len() % 2];
|
||||
Self::pack_into(&mut buf, data);
|
||||
buf
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue