blame: check return value from read_sha1_file()

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

diff --git a/builtin-blame.c b/builtin-blame.c
index 0519339098f3258ae6cc2b50d30679a8cfc7f2c7..dc88a953a519e975f426f6158b73542a2ea120dd 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -98,6 +98,10 @@ static char *fill_origin_blob(struct origin *o, mmfile_t *file)
                num_read_blob++;
                file->ptr = read_sha1_file(o->blob_sha1, &type,
                                           (unsigned long *)(&(file->size)));
                num_read_blob++;
                file->ptr = read_sha1_file(o->blob_sha1, &type,
                                           (unsigned long *)(&(file->size)));

+               if (!file->ptr)
+                       die("Cannot read blob %s for path %s",
+                           sha1_to_hex(o->blob_sha1),
+                           o->path);

                o->file = *file;
        }
        else
                o->file = *file;
        }
        else


@@ -1384,6 +1388,9 @@ static void get_commit_info(struct commit *commit,
                unsigned long size;
                commit->buffer =
                        read_sha1_file(commit->object.sha1, &type, &size);
                unsigned long size;
                commit->buffer =
                        read_sha1_file(commit->object.sha1, &type, &size);

+               if (!commit->buffer)
+                       die("Cannot read commit %s",
+                           sha1_to_hex(commit->object.sha1));

        }
        ret->author = author_buf;
        get_ac_line(commit->buffer, "\nauthor ",
        }
        ret->author = author_buf;
        get_ac_line(commit->buffer, "\nauthor ",


@@ -2382,6 +2389,10 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 
                sb.final_buf = read_sha1_file(o->blob_sha1, &type,
                                              &sb.final_buf_size);
 
                sb.final_buf = read_sha1_file(o->blob_sha1, &type,
                                              &sb.final_buf_size);

+               if (!sb.final_buf)
+                       die("Cannot read blob %s for path %s",
+                           sha1_to_hex(o->blob_sha1),
+                           path);

        }
        num_read_blob++;
        lno = prepare_lines(&sb);
        }
        num_read_blob++;
        lno = prepare_lines(&sb);