count-objects: do not use xsize_t when counting object size

peff · gitster · commit cac05d4dfd14 · 2014-10-16T10:10:41.000-07:00
The point of xsize_t is to safely cast an off_t into a size_t
(because we are about to mmap). But in count-objects, we are
summing the sizes in an off_t. Using xsize_t means that
count-objects could fail on a 32-bit system with a 4G
object (not likely, as other parts of git would fail, but
we should at least be correct here).

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/count-objects.c b/builtin/count-objects.c
@@ -53,7 +53,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,
 			if (lstat(path, &st) || !S_ISREG(st.st_mode))
 				bad = 1;
 			else
-				(*loose_size) += xsize_t(on_disk_bytes(st));
+				(*loose_size) += on_disk_bytes(st);
 		}
 		if (bad) {
 			if (verbose) {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ static void count_objects(DIR d, char path, int len, int verbose,`
`53`	`53`	`if (lstat(path, &st) \|\| !S_ISREG(st.st_mode))`
`54`	`54`	`bad = 1;`
`55`	`55`	`else`
`56`		`- (*loose_size) += xsize_t(on_disk_bytes(st));`
	`56`	`+ (*loose_size) += on_disk_bytes(st);`
`57`	`57`	`}`
`58`	`58`	`if (bad) {`
`59`	`59`	`if (verbose) {`