undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

receive-pack, fetch-pack: reject bogus pack that records objects twice

Browse Source 
When receive-pack & fetch-pack are run and store the pack obtained over
the wire to a local repository, they internally run the index-pack command
with the --strict option. Make sure that we reject incoming packfile that
records objects twice to avoid spreading such a damage.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-11-16 22:04:13 -08:00
parent 6f62cd7ab1
commit 68be2fea50
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/index-pack.c
View File

@ -1122,8 +1122,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
if (!index_name) if (!index_name)
die("--verify with no packfile name given"); die("--verify with no packfile name given");
read_idx_option(&opts, index_name); read_idx_option(&opts, index_name);
opts.flags |= WRITE_IDX_VERIFY; opts.flags |= WRITE_IDX_VERIFY | WRITE_IDX_STRICT;
} }
if (strict)
opts.flags |= WRITE_IDX_STRICT;
curr_pack = open_pack_file(pack_name); curr_pack = open_pack_file(pack_name);
parse_pack_header(); parse_pack_header();

2
object.c
View File

@ -149,6 +149,8 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
struct tree *tree = lookup_tree(sha1); struct tree *tree = lookup_tree(sha1);
if (tree) { if (tree) {
obj = &tree->object; obj = &tree->object;
if (!tree->buffer)
tree->object.parsed = 0;
if (!tree->object.parsed) { if (!tree->object.parsed) {
if (parse_tree_buffer(tree, buffer, size)) if (parse_tree_buffer(tree, buffer, size))
return NULL; return NULL;

4
pack-write.c
View File

@ -129,6 +129,10 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
} }
sha1write(f, obj->sha1, 20); sha1write(f, obj->sha1, 20);
git_SHA1_Update(&ctx, obj->sha1, 20); git_SHA1_Update(&ctx, obj->sha1, 20);
if ((opts->flags & WRITE_IDX_STRICT) &&
(i && !hashcmp(list[-2]->sha1, obj->sha1)))
die("The same object %s appears twice in the pack",
sha1_to_hex(obj->sha1));
} }
if (index_version >= 2) { if (index_version >= 2) {

3
pack.h
View File

@ -37,7 +37,8 @@ struct pack_header {
struct pack_idx_option { struct pack_idx_option {
unsigned flags; unsigned flags;
/* flag bits */ /* flag bits */
#define WRITE_IDX_VERIFY 01 #define WRITE_IDX_VERIFY 01 /* verify only, do not write the idx file */
#define WRITE_IDX_STRICT 02
uint32_t version; uint32_t version;
uint32_t off32_limit; uint32_t off32_limit;