Merge branch 'maint'

* maint:
  Increase the size of the die/warning buffer to avoid truncation
  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 19:45:57 -07:00
3 changed files with 3 additions and 3 deletions

View File

@ -1293,7 +1293,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
max_size = trg_entry->delta_size;
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);
if (max_size == 0)
return 0;