summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2007-06-16 22:37:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-17 00:55:44 (GMT)
commitc927e6c69b50877e116340671ed35aaf6d3a8f49 (patch)
treec88223f32daf48d3a04ae50aaf9f9495ec8de6f9
parent4234a76167b12a7669dae0e6386c62e712b9dcf5 (diff)
downloadgit-c927e6c69b50877e116340671ed35aaf6d3a8f49.zip
git-c927e6c69b50877e116340671ed35aaf6d3a8f49.tar.gz
git-c927e6c69b50877e116340671ed35aaf6d3a8f49.tar.bz2
Fix ALLOC_GROW off-by-one
The ALLOC_GROW macro will never let us fill the array completely, instead allocating an extra chunk if that would be the case. This is because the 'nr' argument was originally treated as "how much we do have now" instead of "how much do we want". The latter makes much more sense because you can grow by more than one item. This off-by-one never resulted in an error because it meant we were overly conservative about when to allocate. Any callers which passed "how much we have now" need to be updated, or they will fail to allocate enough. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 9700ca5..aba7a5e 100644
--- a/cache.h
+++ b/cache.h
@@ -234,7 +234,7 @@ extern void verify_non_filename(const char *prefix, const char *name);
*/
#define ALLOC_GROW(x, nr, alloc) \
do { \
- if ((nr) >= alloc) { \
+ if ((nr) > alloc) { \
if (alloc_nr(alloc) < (nr)) \
alloc = (nr); \
else \