From: Jeff King <peff@peff.net> To: git@vger.kernel.org Subject: [PATCH 4/6] tree-walk: accept a raw length for traverse_path_len() Date: Wed, 31 Jul 2019 00:38:20 -0400 [thread overview] Message-ID: <20190731043820.GD27170@sigill.intra.peff.net> (raw) In-Reply-To: <20190731043659.GA27028@sigill.intra.peff.net> We take a "struct name_entry", but only care about the length of the path name. Let's just take that length directly, making it easier to use the function from callers that sometimes do not have a name_entry at all. Signed-off-by: Jeff King <peff@peff.net> --- builtin/merge-tree.c | 2 +- tree-walk.h | 5 +++-- unpack-trees.c | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index d8ace972c7..225460fe13 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -180,7 +180,7 @@ static struct merge_list *create_entry(unsigned stage, unsigned mode, const stru static char *traverse_path(const struct traverse_info *info, const struct name_entry *n) { - char *path = xmallocz(traverse_path_len(info, n)); + char *path = xmallocz(traverse_path_len(info, tree_entry_len(n))); return make_traverse_path(path, info, n->path, n->pathlen); } diff --git a/tree-walk.h b/tree-walk.h index 95de0506c8..98580a6f0b 100644 --- a/tree-walk.h +++ b/tree-walk.h @@ -76,9 +76,10 @@ char *make_traverse_path(char *path, const struct traverse_info *info, const char *name, size_t namelen); void setup_traverse_info(struct traverse_info *info, const char *base); -static inline size_t traverse_path_len(const struct traverse_info *info, const struct name_entry *n) +static inline size_t traverse_path_len(const struct traverse_info *info, + size_t namelen) { - return st_add(info->pathlen, tree_entry_len(n)); + return st_add(info->pathlen, namelen); } /* in general, positive means "kind of interesting" */ diff --git a/unpack-trees.c b/unpack-trees.c index a014ae9907..88e4e55a73 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -686,7 +686,7 @@ static int index_pos_by_traverse_info(struct name_entry *names, struct traverse_info *info) { struct unpack_trees_options *o = info->data; - size_t len = traverse_path_len(info, names); + size_t len = traverse_path_len(info, tree_entry_len(names)); char *name = xmalloc(len + 1 /* slash */ + 1 /* NUL */); int pos; @@ -936,7 +936,7 @@ static int compare_entry(const struct cache_entry *ce, const struct traverse_inf * Even if the beginning compared identically, the ce should * compare as bigger than a directory leading up to it! */ - return ce_namelen(ce) > traverse_path_len(info, n); + return ce_namelen(ce) > traverse_path_len(info, tree_entry_len(n)); } static int ce_in_traverse_path(const struct cache_entry *ce, @@ -960,7 +960,7 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info, struct index_state *istate, int is_transient) { - size_t len = traverse_path_len(info, n); + size_t len = traverse_path_len(info, tree_entry_len(n)); struct cache_entry *ce = is_transient ? make_empty_transient_cache_entry(len) : -- 2.23.0.rc0.426.gbdee707ba7
next prev parent reply other threads:[~2019-07-31 4:38 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-31 4:37 [PATCH 0/6] harden tree-walking against integer overflow Jeff King 2019-07-31 4:38 ` [PATCH 1/6] setup_traverse_info(): stop copying oid Jeff King 2019-07-31 4:38 ` [PATCH 2/6] tree-walk: drop oid from traverse_info Jeff King 2019-07-31 4:38 ` [PATCH 3/6] tree-walk: use size_t consistently Jeff King 2019-08-01 18:17 ` Derrick Stolee 2019-07-31 4:38 ` Jeff King [this message] 2019-07-31 4:38 ` [PATCH 5/6] tree-walk: add a strbuf wrapper for make_traverse_path() Jeff King 2019-07-31 4:38 ` [PATCH 6/6] tree-walk: harden make_traverse_path() length computations Jeff King
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190731043820.GD27170@sigill.intra.peff.net \ --to=peff@peff.net \ --cc=git@vger.kernel.org \ --subject='Re: [PATCH 4/6] tree-walk: accept a raw length for traverse_path_len()' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).