Skip to content

Commit ecc4e09

Browse files
mikemiles-devmikemiles-dev
and
mikemiles-dev
authored
0 len check (#61)
Co-authored-by: mikemiles-dev <[email protected]>
1 parent b5bee62 commit ecc4e09

File tree

5 files changed

+18
-6
lines changed

5 files changed

+18
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "netflow_parser"
33
description = "Parser for Netflow Cisco V5, V7, V9, IPFIX"
4-
version = "0.3.0"
4+
version = "0.3.1"
55
edition = "2021"
66
77
license = "MIT OR Apache-2.0"

RELEASES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 0.3.1
2+
* Added 0 length check when parsing template lengths.
3+
14
# 0.3.0
25
* Reworked IPFIX + V9 Parsing. Flowset length is now used.
36
* Flow data field Counts are now correctly calculated.

SECURITY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
| Version | Supported |
66
| ------- | ------------------ |
7+
| 0.3.1 | :white_check_mark: |
78
| 0.3.0 | :white_check_mark: |
89
| 0.2.9 | :white_check_mark: |
910
| 0.2.8 | :white_check_mark: |

src/variable_versions/ipfix.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,11 +287,15 @@ fn parse_fields<'a, T: CommonTemplate>(
287287
let mut fields = vec![];
288288
let mut remaining = i;
289289

290-
let count: usize = i.len()
291-
/ template_fields
292-
.iter()
293-
.map(|m| m.field_length as usize)
294-
.sum::<usize>();
290+
let total_size = template_fields
291+
.iter()
292+
.map(|m| m.field_length as usize)
293+
.sum::<usize>();
294+
295+
if total_size == 0 {
296+
return Ok((&[], fields));
297+
}
298+
let count: usize = i.len() / total_size;
295299

296300
let mut error = false;
297301

src/variable_versions/v9.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,10 @@ fn parse_fields<'a>(
370370
};
371371
let mut remaining = i;
372372

373+
if template.get_total_size() == 0 {
374+
return Ok((&[], fields));
375+
}
376+
373377
let count = i.len() as u16 / template.get_total_size();
374378

375379
for _ in 0..count {

0 commit comments

Comments
 (0)