Re: [PATCH v2] revision.c: fix possible null pointer access
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:07:24
Stefan Naewe [off-list ref] writes:
mark_tree_uninteresting dereferences a tree pointer before checking if the pointer is valid. Fix that by doing the check first. Signed-off-by: Stefan Naewe <redacted> ---
I still have a problem with "dereferences", as "dereference" is about computing an address and accessing memory based on the result, and only the first half is happening here. I can live with "The function does a pointer arithmetic on 'tree' before it makes sure that 'tree' is not NULL", but in any case, let's queue this as-is for now and wait for a while to see if others can come up with a more appropriate phrases. Thanks.
quoted hunk
revision.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)diff --git a/revision.c b/revision.c index 0fbb684..8c569cc 100644 --- a/revision.c +++ b/revision.c@@ -135,10 +135,12 @@ static void mark_tree_contents_uninteresting(struct tree *tree) void mark_tree_uninteresting(struct tree *tree) { - struct object *obj = &tree->object; + struct object *obj; if (!tree) return; + + obj = &tree->object; if (obj->flags & UNINTERESTING) return; obj->flags |= UNINTERESTING;