Merge branch 'jc/pack-bitmap-unaligned' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:59:00 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:59:00 +0000 (13:59 -0700)
An unaligned 32-bit access in pack-bitmap code ahs been corrected.

* jc/pack-bitmap-unaligned:
pack-bitmap: don't perform unaligned memory access

1  2 
pack-bitmap.c
diff --combined pack-bitmap.c
index 39bcc168463fc7358ab7cb4e963e6ed8bde94804,09de9ba312dc0c30c4182e5e0d14a0218ffeb39a..294cfa43a4458c6758b8ac1529e48374931b66c8
@@@ -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);
                }