diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-06 12:10:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-06 12:10:02 -0700 |
| commit | 90215bf3008f0986a5a8414d6ea1523148f74826 (patch) | |
| tree | 28ccc42636720fd840fca860db90c23fcda3b23b /builtin/unpack-objects.c | |
| parent | 931c103320e7be6318f3ea107f0701e283b64f35 (diff) | |
| parent | 6db2103f92cf6c5caeeddec0bfd5f57f94e81d81 (diff) | |
| download | git-90215bf3008f0986a5a8414d6ea1523148f74826.tar.gz git-90215bf3008f0986a5a8414d6ea1523148f74826.tar.xz | |
Merge branch 'maint'
* maint:
Documentation/git-clone: describe --mirror more verbosely
do not depend on signed integer overflow
work around buggy S_ISxxx(m) implementations
xdiff: cast arguments for ctype functions to unsigned char
init: plug tiny one-time memory leak
diffcore-pickaxe.c: remove unnecessary curly braces
t3020 (ls-files-error-unmatch): remove stray '1' from end of file
setup: make sure git dir path is in a permanent buffer
environment.c: remove unused variable
git-svn: fix processing of decorated commit hashes
git-svn: check_cherry_pick should exclude commits already in our history
Documentation/git-svn: discourage "noMetadata"
Diffstat (limited to 'builtin/unpack-objects.c')
| -rw-r--r-- | builtin/unpack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 685566e0b..f63973c91 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -83,7 +83,7 @@ static void use(int bytes) offset += bytes; /* make sure off_t is sufficiently large not to wrap */ - if (consumed_bytes > consumed_bytes + bytes) + if (signed_add_overflows(consumed_bytes, bytes)) die("pack too large for current definition of off_t"); consumed_bytes += bytes; } |