[PATCH] cache-tree: fix strbuf growth in prime_cache_tree_rec()
- From
René Scharfe <l.s.r@web.de>
- Date
- Feb 4, 2023, 19:10 UTC
- Message-ID
- <ff3ac119-9b00-746f-470c-8db18c9c61a1@web.de>
Use size_t to store the original length of the strbuf tree_len, as that's the correct type.
Don't double the allocated size of the strbuf when adding a subdirectory name. Only extend it to fit that name and a slash.
Signed-off-by: René Scharfe <l.s.r@web.de> --- cache-tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cache-tree.c b/cache-tree.c index 9af457f47c..35f7617164 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -760,7 +760,7 @@ static void prime_cache_tree_rec(struct repository *r, struct tree_desc desc; struct name_entry entry; int cnt; - int base_path_len = tree_path->len; + size_t base_path_len = tree_path->len; oidcpy(&it->oid, &tree->object.oid); @@ -785,7 +785,7 @@ static void prime_cache_tree_rec(struct repository *r, */ if (r->index->sparse_index) { strbuf_setlen(tree_path, base_path_len); - strbuf_grow(tree_path, base_path_len + entry.pathlen + 1); + strbuf_grow(tree_path, entry.pathlen + 1); strbuf_add(tree_path, entry.path, entry.pathlen); strbuf_addch(tree_path, '/'); } -- 2.39.1