From d09e2cd5516473753cb067e723293fab180e0b1b Mon Sep 17 00:00:00 2001 From: Dmitry Potapov Date: Sun, 5 Oct 2008 06:14:40 +0400 Subject: [PATCH] do not segfault if make_cache_entry failed Signed-off-by: Dmitry Potapov Signed-off-by: Shawn O. Pearce --- builtin-apply.c | 2 ++ builtin-reset.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/builtin-apply.c b/builtin-apply.c index 70c9f9355..2c87cf57f 100644 --- 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-reset.c b/builtin-reset.c index c24c21909..16e6bb20f 100644 --- 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 -- 2.30.2