summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2011-02-05 10:52:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-07 23:05:25 (GMT)
commitc879daa23729547fb28aa7e8783c5e4e619a9e7c (patch)
tree0c73b7150204bf11f9ca90683b36e3229fb22279 /read-cache.c
parentcf7b1cad0e8b024538de975dff5893262cec72d7 (diff)
downloadgit-c879daa23729547fb28aa7e8783c5e4e619a9e7c.zip
git-c879daa23729547fb28aa7e8783c5e4e619a9e7c.tar.gz
git-c879daa23729547fb28aa7e8783c5e4e619a9e7c.tar.bz2
Make hash-object more robust against malformed objects
Commits, trees and tags have structure. Don't let users feed git with malformed ones. Sooner or later git will die() when encountering them. Note that this patch does not check semantics. A tree that points to non-existent objects is perfectly OK (and should be so, users may choose to add commit first, then its associated tree for example). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c
index 4f2e890..fbc12f3 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -92,7 +92,7 @@ static int ce_compare_data(struct cache_entry *ce, struct stat *st)
if (fd >= 0) {
unsigned char sha1[20];
- if (!index_fd(sha1, fd, st, 0, OBJ_BLOB, ce->name))
+ if (!index_fd(sha1, fd, st, 0, OBJ_BLOB, ce->name, 0))
match = hashcmp(sha1, ce->sha1);
/* index_fd() closed the file descriptor already */
}