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

refactor pack structure allocation

Browse Source 
New pack structures are currently allocated in 2 different places
and all members have to be initialized explicitly.  This is prone
to errors leading to segmentation faults as found by Teemu Likonen.

Let's have a common place where this structure is allocated, and have
all members explicitly initialized to zero.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nicolas Pitre 2008-06-24 18:58:06 -04:00 committed by Junio C Hamano
parent 29b0d01912
commit 27d69a465d
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sha1_file.c
View File

@ -792,18 +792,28 @@ unsigned char* use_pack(struct packed_git *p,
return win->base + offset; return win->base + offset;
} }
static struct packed_git *alloc_packed_git(int extra)
{
struct packed_git *p = xmalloc(sizeof(*p) + extra);
memset(p, 0, sizeof(*p));
p->pack_fd = -1;
return p;
}
struct packed_git *add_packed_git(const char *path, int path_len, int local) struct packed_git *add_packed_git(const char *path, int path_len, int local)
{ {
struct stat st; struct stat st;
struct packed_git *p = xmalloc(sizeof(*p) + path_len + 2); struct packed_git *p = alloc_packed_git(path_len + 2);
/* /*
* Make sure a corresponding .pack file exists and that * Make sure a corresponding .pack file exists and that
* the index looks sane. * the index looks sane.
*/ */
path_len -= strlen(".idx"); path_len -= strlen(".idx");
if (path_len < 1) if (path_len < 1) {
free(p);
return NULL; return NULL;
}
memcpy(p->pack_name, path, path_len); memcpy(p->pack_name, path, path_len);
strcpy(p->pack_name + path_len, ".pack"); strcpy(p->pack_name + path_len, ".pack");
if (stat(p->pack_name, &st) || !S_ISREG(st.st_mode)) { if (stat(p->pack_name, &st) || !S_ISREG(st.st_mode)) {
@ -814,16 +824,7 @@ struct packed_git *add_packed_git(const char *path, int path_len, int local)
/* ok, it looks sane as far as we can check without /* ok, it looks sane as far as we can check without
* actually mapping the pack file. * actually mapping the pack file.
*/ */
p->index_version = 0;
p->index_data = NULL;
p->index_size = 0;
p->num_objects = 0;
p->num_bad_objects = 0;
p->bad_object_sha1 = NULL;
p->pack_size = st.st_size; p->pack_size = st.st_size;
p->next = NULL;
p->windows = NULL;
p->pack_fd = -1;
p->pack_local = local; p->pack_local = local;
p->mtime = st.st_mtime; p->mtime = st.st_mtime;
if (path_len < 40 || get_sha1_hex(path + path_len - 40, p->sha1)) if (path_len < 40 || get_sha1_hex(path + path_len - 40, p->sha1))
@ -835,19 +836,15 @@ struct packed_git *parse_pack_index(unsigned char *sha1)
{ {
const char *idx_path = sha1_pack_index_name(sha1); const char *idx_path = sha1_pack_index_name(sha1);
const char *path = sha1_pack_name(sha1); const char *path = sha1_pack_name(sha1);
struct packed_git *p = xmalloc(sizeof(*p) + strlen(path) + 2); struct packed_git *p = alloc_packed_git(strlen(path) + 1);
strcpy(p->pack_name, path);
hashcpy(p->sha1, sha1);
if (check_packed_git_idx(idx_path, p)) { if (check_packed_git_idx(idx_path, p)) {
free(p); free(p);
return NULL; return NULL;
} }
strcpy(p->pack_name, path);
p->pack_size = 0;
p->next = NULL;
p->windows = NULL;
p->pack_fd = -1;
hashcpy(p->sha1, sha1);
return p; return p;
} }