summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Potapov <dpotapov@gmail.com>2008-10-05 02:14:40 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-10-06 07:49:57 (GMT)
commitd09e2cd5516473753cb067e723293fab180e0b1b (patch)
treeebf5708b1076468cefe37763f41660cd1ce5256e
parent62525ef78e8aec776f44da525030d76b52f14a57 (diff)
downloadgit-d09e2cd5516473753cb067e723293fab180e0b1b.zip
git-d09e2cd5516473753cb067e723293fab180e0b1b.tar.gz
git-d09e2cd5516473753cb067e723293fab180e0b1b.tar.bz2
do not segfault if make_cache_entry failed
Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--builtin-apply.c2
-rw-r--r--builtin-reset.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index 70c9f93..2c87cf5 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 c24c219..16e6bb2 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