mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent git-upload-pack segfault if object cannot be found

Browse Source 
Signed-off-by: Carl Worth <cworth@cworth.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Carl Worth
2006-02-17 16:14:52 -08:00
committed by Junio C Hamano
parent eedf8f97e5
commit b5b16990f8
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sha1_file.c
View File

@ -551,8 +551,10 @@ static void prepare_packed_git_one(char *objdir, int local)
sprintf(path, "%s/pack", objdir); sprintf(path, "%s/pack", objdir);
len = strlen(path); len = strlen(path);
dir = opendir(path); dir = opendir(path);
if (!dir) if (!dir) {
fprintf(stderr, "unable to open object pack directory: %s: %s\n", path, strerror(errno));
return; return;
}
path[len++] = '/'; path[len++] = '/';
while ((de = readdir(dir)) != NULL) { while ((de = readdir(dir)) != NULL) {
int namelen = strlen(de->d_name); int namelen = strlen(de->d_name);

3
upload-pack.c
View File

@ -216,6 +216,9 @@ static int send_ref(const char *refname, const unsigned char *sha1)
static char *capabilities = "multi_ack"; static char *capabilities = "multi_ack";
struct object *o = parse_object(sha1); struct object *o = parse_object(sha1);
if (!o)
die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1));
if (capabilities) if (capabilities)
packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname, packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
0, capabilities); 0, capabilities);