From: Junio C Hamano Date: Sat, 25 Aug 2007 08:30:04 GMT Subject: [PATCH 1/2] blame: check return value from read_sha1_file() Message-ID: <7v7ink6mpf.fsf@gitster.siamese.dyndns.org> In-Reply-To: <20070825072604.GA20155@spearce.org> (Trivial #1). Signed-off-by: Junio C Hamano --- builtin-blame.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/builtin-blame.c b/builtin-blame.c index 0519339..dc88a95 100644 --- 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))); + if (!file->ptr) + die("Cannot read blob %s for path %s", + sha1_to_hex(o->blob_sha1), + o->path); 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); + if (!commit->buffer) + die("Cannot read commit %s", + sha1_to_hex(commit->object.sha1)); } 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); + 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); -- 1.5.3.rc6.23.g0058