]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/pack-header-parse-alignment-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Jan 2025 21:02:23 +0000 (13:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Jan 2025 21:02:23 +0000 (13:02 -0800)
It was possible for "git unpack-objects" and "git index-pack" to
make an unaligned access, which has been corrected.

* jk/pack-header-parse-alignment-fix:
  index-pack, unpack-objects: use skip_prefix to avoid magic number
  index-pack, unpack-objects: use get_be32() for reading pack header
  parse_pack_header_option(): avoid unaligned memory writes
  packfile: factor out --pack_header argument parsing
  bswap.h: squelch potential sparse -Wcast-truncate warnings

1  2 
builtin/index-pack.c
builtin/unpack-objects.c
pack.h
packfile.c
packfile.h

Simple merge
Simple merge
diff --cc pack.h
Simple merge
diff --cc packfile.c
Simple merge
diff --cc packfile.h
Simple merge