@matheusbsbs / matheus-bagliano / commits / 667b76ec58
Fork 0

walker_fetch(): avoid raw array length computation

We compute the length of an array of object_id's with a raw multiplication. In theory this could trigger an integer overflow which would cause an under-allocation (and eventually an out of bounds write). I doubt this can be triggered in practice, since you'd need to feed it an enormous number of target objects, which would typically come from the ref advertisement and be using proportional memory. And even on 64-bit systems, where "int" is much smaller than "size_t", that should hold: even though "targets" is an int, the multiplication will be done as a size_t because of the use of sizeof(). But we can easily fix it by using ALLOC_ARRAY(), which uses st_mult() under the hood. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jan 30, 2020 at 04:52 UTC 667b76ec5819b151355e322ad9c6264b9cb3f9cd
1 file changed +3 -1
walker.c
+3 -1
@@ -261,12 +261,14 @@ int walker_fetch(struct walker *walker, int targets, char **target,
261 struct strbuf refname = STRBUF_INIT;
262 struct strbuf err = STRBUF_INIT;
263 struct ref_transaction *transaction = NULL;
264 - struct object_id *oids = xmalloc(targets * sizeof(struct object_id));
264 + struct object_id *oids;
265 char *msg = NULL;
266 int i, ret = -1;
267
268 save_commit_buffer = 0;
269
270 + ALLOC_ARRAY(oids, targets);
271 +
272 if (write_ref) {
273 transaction = ref_transaction_begin(&err);
274 if (!transaction) {