1. Stefan Saasen
  2. git


Junio C Hamano  committed ea6f0a2

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

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

Signed-off-by: Junio C Hamano <gitster@pobox.com>

  • Participants
  • Parent commits a1cdc25
  • Branches master

Comments (0)

Files changed (1)

File builtin/fsck.c

View file
 	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)
 	DIR *dir = opendir(path);
 	struct dirent *de;
+	char name[100];
 	if (!dir)
 	if (verbose)
 		fprintf(stderr, "Checking directory %s\n", path);
+	sprintf(name, "%02x", i);
 	while ((de = readdir(dir)) != NULL) {
-		char name[100];
 		unsigned char sha1[20];
 		if (is_dot_or_dotdot(de->d_name))
-		if (strlen(de->d_name) == 38) {
-			sprintf(name, "%02x", i);
-			memcpy(name+2, de->d_name, 39);
-			if (get_sha1_hex(name, sha1) < 0)
-				break;
+		if (is_loose_object_file(de, name, sha1)) {
 			add_sha1_list(sha1, DIRENT_SORT_HINT(de));