Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dnp3/src/app/parse/bytes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ impl<'a> Iterator for RangedBytesIterator<'a> {
}
let bytes = self.cursor.read_bytes(self.size).ok()?;
let index = self.index;
self.index += 1;
self.index = self.index.saturating_add(1);
Comment thread
jadamcrain marked this conversation as resolved.
self.remaining -= 1;
Some((bytes, index))
}
Expand Down
19 changes: 19 additions & 0 deletions dnp3/src/app/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1152,6 +1152,25 @@ mod test {
assert_matches!(headers.next(), None);
}

#[test]
fn parses_group110var1_at_max_index() {
let input = [0x6E, 0x01, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA];
let mut headers =
ObjectParser::parse(ParseOptions::default(), FunctionCode::Response, &input)
.unwrap()
.iter();

let bytes: Vec<(&[u8], u16)> = assert_matches!(
headers.next().unwrap().details,
HeaderDetails::TwoByteStartStop(0xFFFF, 0xFFFF, RangedVariation::Group110VarX(0x01, seq)) => {
seq.iter().collect()
}
);

assert_eq!(bytes, vec![([0xAA].as_slice(), 0xFFFF)]);
assert_matches!(headers.next(), None);
}

#[test]
fn parses_group111var1_as_non_read() {
let input = [
Expand Down
Loading