summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Clarke <jrtc27@jrtc27.com>2017-06-26 16:16:12 +0100
committerJunio C Hamano <gitster@pobox.com>2017-06-26 12:32:31 -0700
commitda41c942b307e0beab1fc5800a42b0c495f54ff6 (patch)
tree015affaa008353dad767538a216ac7712152ab8f
parent840ed141983718e0c5518a325534a5656797132a (diff)
downloadgit-da41c942b307e0beab1fc5800a42b0c495f54ff6.tar.gz
pack-bitmap: don't perform unaligned memory accessjc/pack-bitmap-unaligned
The preceding bitmap entries have a 1-byte XOR-offset and 1-byte flags, so their size is not a multiple of 4. Thus the name-hash cache is only guaranteed to be 2-byte aligned and so we must use get_be32 rather than indexing the array directly. Signed-off-by: James Clarke <jrtc27@jrtc27.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--pack-bitmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c
index b949e51716..09de9ba312 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -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);
}