kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2015-12-11 11:14:38 -08:00
parent abca668a93 a2678df335
commit 58e3dd21f6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
revision.c
View File

@ -135,10 +135,12 @@ static void mark_tree_contents_uninteresting(struct tree *tree)


void mark_tree_uninteresting(struct tree *tree) void mark_tree_uninteresting(struct tree *tree)
{ {
struct object *obj = &tree->object; struct object *obj;


if (!tree) if (!tree)
return; return;

obj = &tree->object;
if (obj->flags & UNINTERESTING) if (obj->flags & UNINTERESTING)
return; return;
obj->flags |= UNINTERESTING; obj->flags |= UNINTERESTING;