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

Merge branch 'maint-1.6.1' into maint

Browse Source 
* maint-1.6.1:
  close_sha1_file(): make it easier to diagnose errors
  avoid possible overflow in delta size filtering computation
This commit is contained in:
Junio C Hamano 2009-03-24 15:31:21 -07:00
commit b0de555410
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-pack-objects.c
View File

@ -1293,7 +1293,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
max_size = trg_entry->delta_size; max_size = trg_entry->delta_size;
ref_depth = trg->depth; ref_depth = trg->depth;
} }
max_size = max_size * (max_depth - src->depth) / max_size = (uint64_t)max_size * (max_depth - src->depth) /
(max_depth - ref_depth + 1); (max_depth - ref_depth + 1);
if (max_size == 0) if (max_size == 0)
return 0; return 0;

2
sha1_file.c
View File

@ -2301,7 +2301,7 @@ static void close_sha1_file(int fd)
fsync_or_die(fd, "sha1 file"); fsync_or_die(fd, "sha1 file");
fchmod(fd, 0444); fchmod(fd, 0444);
if (close(fd) != 0) if (close(fd) != 0)
die("unable to write sha1 file"); die("error when closing sha1 file (%s)", strerror(errno));
} }
/* Size of directory component, including the ending '/' */ /* Size of directory component, including the ending '/' */