summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-12-11 19:14:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-12-11 19:14:38 (GMT)
commit58e3dd21f68c5eec945e7ddd4690733bd0103ce5 (patch)
tree2f68876b8a17df7a81115112d5762d6282b985dc
parentabca668a93f0039c8c3fe81a6625fcdf81c35bdf (diff)
parenta2678df335f3404bc5d96683fa36b8cfab7946b0 (diff)
downloadgit-58e3dd21f68c5eec945e7ddd4690733bd0103ce5.zip
git-58e3dd21f68c5eec945e7ddd4690733bd0103ce5.tar.gz
git-58e3dd21f68c5eec945e7ddd4690733bd0103ce5.tar.bz2
Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maint
mark_tree_uninteresting() has code to handle the case where it gets passed a NULL pointer in its 'tree' parameter, but the function had 'object = &tree->object' assignment before checking if tree is NULL. This gives a compiler an excuse to declare that tree will never be NULL and apply a wrong optimization. Avoid it. * sn/null-pointer-arith-in-mark-tree-uninteresting: revision.c: fix possible null pointer arithmetic
-rw-r--r--revision.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index 351fb5b..f6caef0 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;