Merge pull request #2345 from matts1/push-utkmrmunzotv

Byron · web-flow · commit c0cf38f98ac5 · 2026-01-06T07:38:16.000+01:00
fix[pack]: Don't decompress the delta when decompressing base objects.
diff --git a/gix-pack/src/data/file/decode/entry.rs b/gix-pack/src/data/file/decode/entry.rs
@@ -345,7 +345,8 @@ impl File {
                 let base_entry = cursor;
                 debug_assert!(!base_entry.header.is_delta());
                 object_kind = base_entry.header.as_kind();
-                self.decompress_entry_from_data_offset(base_entry.data_offset, inflate, out)?;
+                let out_base = &mut out[..out_size - total_delta_data_size];
+                self.decompress_entry_from_data_offset(base_entry.data_offset, inflate, out_base)?;
             }
 
             (first_buffer_size, second_buffer_end)

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,8 @@ impl File {`
`345`	`345`	`let base_entry = cursor;`
`346`	`346`	`debug_assert!(!base_entry.header.is_delta());`
`347`	`347`	`object_kind = base_entry.header.as_kind();`
`348`		`- self.decompress_entry_from_data_offset(base_entry.data_offset, inflate, out)?;`
	`348`	`+ let out_base = &mut out[..out_size - total_delta_data_size];`
	`349`	`+ self.decompress_entry_from_data_offset(base_entry.data_offset, inflate, out_base)?;`
`349`	`350`	`}`
`350`	`351`
`351`	`352`	`(first_buffer_size, second_buffer_end)`