[PATCH] Fix an unitialized pointer in merge-recursive.c

From: Marco Costalba <mcostalba@gmail.com>
Date: Aug 16, 2007, 08:00 UTC
Message-ID: <e5bfff550708160100t5aa93430x6cbe83e6e7a61d73@mail.gmail.com>

Indeed &mrtree is passed to merge_trees() that not always seems to set the value, so on some paths mrtree could return uninitialized.

Spotted by a gcc 4.2.1 warning

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
---
 merge-recursive.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index 16f6a0f..934b0d6 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1610,7 +1610,7 @@ static int merge(struct commit
 {
  	struct commit_list *iter;
  	struct commit *merged_common_ancestors;
-	struct tree *mrtree;
+	struct tree *mrtree = NULL;
 	int clean;

 	if (show(4)) {

-- 
1.5.3.rc4.67.gf9286