dandavison/delta
1
0
Fork 0
mirror of https://github.com/dandavison/delta.git synced 2026-10-12 02:12:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix index out of bounds crash for '@@ @@' hunk header

Browse Source
This commit is contained in:
Adam Johnson
2025-05-02 17:41:03 +02:00
committed by Thomas Otto
parent 42da5adab6
commit cb610ec4c9
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/hunk_header.rs
+16 -6
View File
@@ -235,7 +235,7 @@ lazy_static! {
fn parse_hunk_header(line: &str) -> Option<ParsedHunkHeader> {
if let Some(caps) = HUNK_HEADER_REGEX.captures(line) {
let file_coordinates = &caps[1];
let line_numbers_and_hunk_lengths = HUNK_HEADER_FILE_COORDINATE_REGEX
let line_numbers_and_hunk_lengths: Vec<(usize, usize)> = HUNK_HEADER_FILE_COORDINATE_REGEX
.captures_iter(file_coordinates)
.map(|caps| {
(
@@ -249,11 +249,15 @@ fn parse_hunk_header(line: &str) -> Option<ParsedHunkHeader> {
)
})
.collect();
let code_fragment = caps[2].to_string();
Some(ParsedHunkHeader {
code_fragment,
line_numbers_and_hunk_lengths,
})
if line_numbers_and_hunk_lengths.is_empty() {
None
} else {
let code_fragment = caps[2].to_string();
Some(ParsedHunkHeader {
code_fragment,
line_numbers_and_hunk_lengths,
})
}
} else {
None
}
@@ -456,6 +460,12 @@ pub mod tests {
assert_eq!(line_numbers_and_hunk_lengths[1], (75, 2),);
}
#[test]
fn test_parse_hunk_header_with_no_hunk_lengths() {
let result = parse_hunk_header("@@ @@\n");
assert_eq!(result, None);
}
#[test]
fn test_parse_hunk_header_added_file() {
let ParsedHunkHeader {