From: Junio C Hamano Date: Sat, 06 Dec 2008 01:54:10 GMT Subject: [PATCH 1/6] builtin-checkout.c: check error return from read_cache() Message-ID: <1228528455-3089-2-git-send-email-gitster@pobox.com> In-Reply-To: <1228528455-3089-1-git-send-email-gitster@pobox.com> Signed-off-by: Junio C Hamano --- builtin-checkout.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin-checkout.c b/builtin-checkout.c index 7f3bd7b..c2c0561 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -228,7 +228,8 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec, struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); newfd = hold_locked_index(lock_file, 1); - read_cache(); + if (read_cache() < 0) + return error("corrupt index file"); if (source_tree) read_tree_some(source_tree, pathspec); @@ -371,7 +372,9 @@ static int merge_working_tree(struct checkout_opts *opts, int ret; struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); int newfd = hold_locked_index(lock_file, 1); - read_cache(); + + if (read_cache() < 0) + return error("corrupt index file"); if (opts->force) { ret = reset_tree(new->commit->tree, opts, 1); -- 1.6.1.rc1.72.ga5ce6