do not segfault if make_cache_entry failed

dmpot · spearce · commit 048f2762007d · 2008-10-06T07:19:36.000-07:00
Signed-off-by: Dmitry Potapov &lt;dpotapov@gmail.com&gt;
Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
diff --git a/builtin-apply.c b/builtin-apply.c
@@ -2586,6 +2586,8 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
 			sha1_ptr = sha1;
 
 		ce = make_cache_entry(patch->old_mode, sha1_ptr, name, 0, 0);
+		if (!ce)
+			die("make_cache_entry failed for path '%s'", name);
 		if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))
 			die ("Could not add %s to temporary index", name);
 	}
diff --git a/builtin-checkout.c b/builtin-checkout.c
@@ -206,6 +206,8 @@ static int checkout_merged(int pos, struct checkout *state)
 	ce = make_cache_entry(create_ce_mode(active_cache[pos+1]->ce_mode),
 			      sha1,
 			      path, 2, 0);
+	if (!ce)
+		die("make_cache_entry failed for path '%s'", path);
 	status = checkout_entry(ce, state, NULL);
 	return status;
 }
diff --git a/builtin-reset.c b/builtin-reset.c
@@ -121,6 +121,9 @@ static void update_index_from_diff(struct diff_queue_struct *q,
 			struct cache_entry *ce;
 			ce = make_cache_entry(one->mode, one->sha1, one->path,
 				0, 0);
+			if (!ce)
+				die("make_cache_entry failed for path '%s'",
+				    one->path);
 			add_cache_entry(ce, ADD_CACHE_OK_TO_ADD |
 				ADD_CACHE_OK_TO_REPLACE);
 		} else

Original file line number	Diff line number	Diff line change
`@@ -2586,6 +2586,8 @@ static void build_fake_ancestor(struct patch list, const char filename)`
`2586`	`2586`	`sha1_ptr = sha1;`
`2587`	`2587`
`2588`	`2588`	`ce = make_cache_entry(patch->old_mode, sha1_ptr, name, 0, 0);`
	`2589`	`+ if (!ce)`
	`2590`	`+ die("make_cache_entry failed for path '%s'", name);`
`2589`	`2591`	`if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))`
`2590`	`2592`	`die ("Could not add %s to temporary index", name);`
`2591`	`2593`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,8 @@ static int checkout_merged(int pos, struct checkout *state)`
`206`	`206`	`ce = make_cache_entry(create_ce_mode(active_cache[pos+1]->ce_mode),`
`207`	`207`	`sha1,`
`208`	`208`	`path, 2, 0);`
	`209`	`+ if (!ce)`
	`210`	`+ die("make_cache_entry failed for path '%s'", path);`
`209`	`211`	`status = checkout_entry(ce, state, NULL);`
`210`	`212`	`return status;`
`211`	`213`	`}`