For this we need the pack version. However only open_packed_git_1() has
been audited for pack v4 so far, hence the version validation is not
added to pack_version_ok() just yet.
Signed-off-by: Nicolas Pitre <n...@fluxnic.net>
---
cache.h | 1 +
sha1_file.c | 14 ++++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/cache.h b/cache.h
index c939b60..59d9ba7 100644
--- a/cache.h
+++ b/cache.h
@@ -1025,6 +1025,7 @@ extern struct packed_git {
uint32_t num_objects;
uint32_t num_bad_objects;
unsigned char *bad_object_sha1;
+ int version;
int index_version;
time_t mtime;
int pack_fd;
diff --git a/sha1_file.c b/sha1_file.c
index 5c63781..a298933 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -10,6 +10,7 @@
#include "string-list.h"
#include "delta.h"
#include "pack.h"
+#include "varint.h"
#include "blob.h"
#include "commit.h"
#include "run-command.h"
@@ -845,10 +846,11 @@ static int open_packed_git_1(struct packed_git *p)
return error("file %s is far too short to be a packfile",
p->pack_name);
if (hdr.hdr_signature != htonl(PACK_SIGNATURE))
return error("file %s is not a GIT packfile", p->pack_name);
- if (!pack_version_ok(hdr.hdr_version))
+ if (!pack_version_ok(hdr.hdr_version) && hdr.hdr_version != htonl(4))
return error("packfile %s is version %"PRIu32" and not"
" supported (try upgrading GIT to a newer version)",
p->pack_name, ntohl(hdr.hdr_version));
+ p->version = ntohl(hdr.hdr_version);
/* Verify the pack matches its index. */
if (p->num_objects != ntohl(hdr.hdr_entries))
@@ -1725,7 +1727,15 @@ int unpack_object_header(struct packed_git *p,
* insane, so we know won't exceed what we have been given.
*/
base = use_pack(p, w_curs, *curpos, &left);
- used = unpack_object_header_buffer(base, left, &type, sizep);
+ if (p->version < 4) {
+ used = unpack_object_header_buffer(base, left, &type, sizep);
+ } else {
+ const unsigned char *cp = base;
+ uintmax_t val = decode_varint(&cp);
+ used = cp - base;
+ type = val & 0xf;
+ *sizep = val >> 4;
+ }
if (!used) {
type = OBJ_BAD;
} else
--
1.8.4.38.g317e65b
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
