git/packfile.c, branch gitk-resize-error

Merge branch 'jt/pack-header-lshift-overflow'

2022-01-12T23:11:41Z

* jt/pack-header-lshift-overflow: packfile: fix off-by-one error in decoding logic

packfile: fix off-by-one error in decoding logic

2022-01-12T20:14:49Z

shift count being exactly at 7-bit smaller than the long is OK; on 32-bit architecture, shift count starts at 4 and goes through 11, 18 and 25, at which point the guard triggers one iteration too early. Reported-by: Marc Strapetz Signed-off-by: Junio C Hamano

Merge branch 'tb/pack-revindex-on-disk-cleanup'

2021-12-15T17:39:50Z

Code clean-up. * tb/pack-revindex-on-disk-cleanup: packfile: make `close_pack_revindex()` static

Merge branch 'jt/pack-header-lshift-overflow'

2021-12-10T22:35:08Z

The code to decode the length of packed object size has been corrected. * jt/pack-header-lshift-overflow: packfile: avoid overflowing shift during decode

packfile: make `close_pack_revindex()` static

2021-12-05T07:01:38Z

Since its definition in 2f4ba2a867 (packfile: prepare for the existence of '*.rev' files, 2021-01-25), the only caller of `close_pack_revindex()` was within packfile.c. Thus there is no need for this to be exposed via packfile.h, and instead can remain static within packfile.c's compilation unit. While we're here, move the function's opening brace onto its own line. Noticed-by: Ramsay Jones Signed-off-by: Taylor Blau Signed-off-by: Junio C Hamano

Merge branch 'mc/clean-smudge-with-llp64'

2021-11-29T23:41:51Z

The clean/smudge conversion code path has been prepared to better work on platforms where ulong is narrower than size_t. * mc/clean-smudge-with-llp64: clean/smudge: allow clean filters to process extremely large files odb: guard against data loss checking out a huge file git-compat-util: introduce more size_t helpers odb: teach read_blob_entry to use size_t t1051: introduce a smudge filter test for extremely large files test-lib: add prerequisite for 64-bit platforms test-tool genzeros: generate large amounts of data more efficiently test-genzeros: allow more than 2G zeros in Windows

packfile: avoid overflowing shift during decode

2021-11-11T18:06:37Z

unpack_object_header_buffer() attempts to protect against overflowing left shifts, but the limit of the shift amount should not be the size of the variable being shifted. It should be the size minus the size of its contents. Fix that accordingly. This was noticed at $DAYJOB by a fuzzer running internally. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano

odb: guard against data loss checking out a huge file

2021-11-03T18:22:27Z

This introduces an additional guard for platforms where `unsigned long` and `size_t` are not of the same size. If the size of an object in the database would overflow `unsigned long`, instead we now exit with an error. A complete fix will have to update _many_ other functions throughout the codebase to use `size_t` instead of `unsigned long`. It will have to be implemented at some stage. This commit puts in a stop-gap for the time being. Helped-by: Johannes Schindelin Signed-off-by: Matt Cooper Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'rs/close-pack-leakfix'

2021-10-04T04:49:20Z

Leakfix. * rs/close-pack-leakfix: packfile: release bad_objects in close_pack()

packfile: release bad_objects in close_pack()

2021-09-24T16:22:46Z

Unusable entries of a damaged pack file are recorded in the oidset bad_objects. Release it when we're done with the pack. This doesn't affect intact packs because an empty oidset requires no allocation. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano