summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2021-09-11 11:01:16 -0400
committerJunio C Hamano <gitster@pobox.com>2021-09-12 16:25:23 -0700
commit8d133a4653abed4b06d3deb8bd71cf55cd87c990 (patch)
tree8ad243c544a170cf5d3c30ec80105ae2cdc5e699
parent225bc32a989d7a22fa6addafd4ce7dcd04675dbf (diff)
strvec: use size_t to store nr and alloc
We converted argv_array (which later became strvec) to use size_t in 819f0e76b1 (argv-array: use size_t for count and alloc, 2020-07-28) in order to avoid the possibility of integer overflow. But later, commit d70a9eb611 (strvec: rename struct fields, 2020-07-28) accidentally converted these back to ints! Those two commits were part of the same patch series. I'm pretty sure what happened is that they were originally written in the opposite order and then cleaned up and re-ordered during an interactive rebase. And when resolving the inevitable conflict, I mistakenly took the "rename" patch completely, accidentally dropping the type change. We can correct it now; better late than never. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--strvec.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/strvec.h b/strvec.h
index fdcad75b45..6b3cbd6758 100644
--- a/strvec.h
+++ b/strvec.h
@@ -29,8 +29,8 @@ extern const char *empty_strvec[];
*/
struct strvec {
const char **v;
- int nr;
- int alloc;
+ size_t nr;
+ size_t alloc;
};
#define STRVEC_INIT { empty_strvec, 0, 0 }