summaryrefslogtreecommitdiff
path: root/builtin/pack-objects.c
diff options
context:
space:
mode:
authorErik Faye-Lund <kusmabite@gmail.com>2010-10-05 07:24:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-06 18:10:07 (GMT)
commitc03c83152d6ce6fa5ae49a8698da5fc25a53127f (patch)
treeea22721f74663fd79d47b87b9ab9a5170481fa57 /builtin/pack-objects.c
parentb90d9b889588ca1cfd5667d1fa703d976edd71ee (diff)
downloadgit-c03c83152d6ce6fa5ae49a8698da5fc25a53127f.zip
git-c03c83152d6ce6fa5ae49a8698da5fc25a53127f.tar.gz
git-c03c83152d6ce6fa5ae49a8698da5fc25a53127f.tar.bz2
do not depend on signed integer overflow
Signed integer overflow is not defined in C, so do not depend on it. This fixes a problem with GCC 4.4.0 and -O3 where the optimizer would consider "consumed_bytes > consumed_bytes + bytes" as a constant expression, and never execute the die()-call. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Acked-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-objects.c')
-rw-r--r--builtin/pack-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 3756cf3..d5a8db1 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -431,7 +431,7 @@ static int write_one(struct sha1file *f,
written_list[nr_written++] = &e->idx;
/* make sure off_t is sufficiently large not to wrap */
- if (*offset > *offset + size)
+ if (signed_add_overflows(*offset, size))
die("pack too large for current definition of off_t");
*offset += size;
return 1;