[PATCH 06/12] load_subtree(): check earlier whether an internal node is a tree entry
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Aug 26, 2017, 08:28 UTC
- Message-ID
- <22e8ace89f28fd2fae31c08b8e86e03a4833e694.1503734566.git.mhagger@alum.mit.edu>
- In-Reply-To
- <cover.1503734566.git.mhagger@alum.mit.edu>
If an entry is not a tree entry, then it cannot possibly be an internal node. But the old code checked this condition only after allocating a leaf_node object and therefore leaked that memory. Instead, check before even entering this branch of the code.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> --- notes.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/notes.c b/notes.c index 768902055e..ac69c5aa18 100644 --- a/notes.c +++ b/notes.c @@ -449,6 +449,11 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree, oidcpy(&l->val_oid, entry.oid); } else if (path_len == 2) { /* This is potentially an internal node */ + + if (!S_ISDIR(entry.mode)) + /* internal nodes must be trees */ + goto handle_non_note; + if (get_oid_hex_segment(entry.path, 2, object_oid.hash + prefix_len, GIT_SHA1_RAWSZ - prefix_len) < 0) @@ -459,8 +464,6 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree, xcalloc(1, sizeof(struct leaf_node)); oidcpy(&l->key_oid, &object_oid); oidcpy(&l->val_oid, entry.oid); - if (!S_ISDIR(entry.mode)) - goto handle_non_note; /* not subtree */ l->key_oid.hash[KEY_INDEX] = (unsigned char) (prefix_len + 1); } else { /* This can't be part of a note */
-- 2.11.0