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

fsck: do not give up too early in fsck_dir()

Browse Source 
When there is a random garbage file whose name happens to be 38-byte
long in a .git/objects/??/ directory, the loop terminated prematurely
without marking all the other files that it hasn't checked in the
readdir() loop.

Treat such a file just like any other garbage file, and do not break out
of the readdir() loop.

While at it, replace repeated sprintf() calls to a single one outside the
loop.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2011-01-26 13:01:54 -08:00
parent a1cdc25172
commit ea6f0a23ac
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/fsck.c
View File

@ -392,10 +392,20 @@ static void add_sha1_list(unsigned char *sha1, unsigned long ino)
sha1_list.nr = ++nr; sha1_list.nr = ++nr;
} }
static inline int is_loose_object_file(struct dirent *de,
char *name, unsigned char *sha1)
{
if (strlen(de->d_name) != 38)
return 0;
memcpy(name + 2, de->d_name, 39);
return !get_sha1_hex(name, sha1);
}
static void fsck_dir(int i, char *path) static void fsck_dir(int i, char *path)
{ {
DIR *dir = opendir(path); DIR *dir = opendir(path);
struct dirent *de; struct dirent *de;
char name[100];
if (!dir) if (!dir)
return; return;
@ -403,17 +413,13 @@ static void fsck_dir(int i, char *path)
if (verbose) if (verbose)
fprintf(stderr, "Checking directory %s\n", path); fprintf(stderr, "Checking directory %s\n", path);
sprintf(name, "%02x", i);
while ((de = readdir(dir)) != NULL) { while ((de = readdir(dir)) != NULL) {
char name[100];
unsigned char sha1[20]; unsigned char sha1[20];
if (is_dot_or_dotdot(de->d_name)) if (is_dot_or_dotdot(de->d_name))
continue; continue;
if (strlen(de->d_name) == 38) { if (is_loose_object_file(de, name, sha1)) {
sprintf(name, "%02x", i);
memcpy(name+2, de->d_name, 39);
if (get_sha1_hex(name, sha1) < 0)
break;
add_sha1_list(sha1, DIRENT_SORT_HINT(de)); add_sha1_list(sha1, DIRENT_SORT_HINT(de));
continue; continue;
} }