builtin-checkout.c: check error return from read_cache()

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-checkout.c b/builtin-checkout.c
index 7f3bd7bb1cb8f211c78067df9376541e0aa3f923..c2c05613b67d7cc8bd3500bdbca4fc3533afaeee 100644 (file)
--- 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);
        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);
 
        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);
        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);
 
        if (opts->force) {
                ret = reset_tree(new->commit->tree, opts, 1);