From: Junio C Hamano Date: Mon, 10 Jul 2017 20:59:00 +0000 (-0700) Subject: Merge branch 'jc/pack-bitmap-unaligned' into maint X-Git-Tag: v2.13.3~17 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b944d7c4b58a8538f63e888fc04e83b89700a7fc?ds=inline;hp=-c Merge branch 'jc/pack-bitmap-unaligned' into maint An unaligned 32-bit access in pack-bitmap code ahs been corrected. * jc/pack-bitmap-unaligned: pack-bitmap: don't perform unaligned memory access --- b944d7c4b58a8538f63e888fc04e83b89700a7fc diff --combined pack-bitmap.c index 39bcc16846,09de9ba312..294cfa43a4 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@@ -266,7 -266,7 +266,7 @@@ static int open_pack_bitmap_1(struct pa return -1; idx_name = pack_bitmap_filename(packfile); - fd = git_open_noatime(idx_name); + fd = git_open(idx_name); free(idx_name); if (fd < 0) @@@ -627,7 -627,7 +627,7 @@@ static void show_objects_for_type sha1 = nth_packed_object_sha1(bitmap_git.pack, entry->nr); if (bitmap_git.hashes) - hash = ntohl(bitmap_git.hashes[entry->nr]); + hash = get_be32(bitmap_git.hashes + entry->nr); show_reach(sha1, object_type, 0, hash, bitmap_git.pack, entry->offset); }