diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-18 20:56:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-18 20:56:01 -0800 |
| commit | ee4f06c0a60d8b17efdd8f6a3332f175f6aafe0e (patch) | |
| tree | b73e7c94f1cadff7cdaae5e4ddc27e7dda1c2f02 /upload-pack.c | |
| parent | 3d51e1b5b84bde24f9a19e3cee603f0b57f62001 (diff) | |
| parent | f73df331a43a6092af427fd30bb6ce07f313743c (diff) | |
| download | git-ee4f06c0a60d8b17efdd8f6a3332f175f6aafe0e.tar.gz | |
Merge branch 'mk/maint-parse-careful'
* mk/maint-parse-careful:
peel_onion: handle NULL
check return value from parse_commit() in various functions
parse_commit: don't fail, if object is NULL
revision.c: handle tag->tagged == NULL
reachable.c::process_tree/blob: check for NULL
process_tag: handle tag->tagged == NULL
check results of parse_commit in merge_bases
list-objects.c::process_tree/blob: check for NULL
reachable.c::add_one_tree: handle NULL from lookup_tree
mark_blob/tree_uninteresting: check for NULL
get_sha1_oneline: check return value of parse_object
read_object_with_reference: don't read beyond the buffer
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c index de147853b5..b26d05331d 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -534,7 +534,8 @@ static void receive_needs(void) /* make sure the real parents are parsed */ unregister_shallow(object->sha1); object->parsed = 0; - parse_commit((struct commit *)object); + if (parse_commit((struct commit *)object)) + die("invalid commit"); parents = ((struct commit *)object)->parents; while (parents) { add_object_array(&parents->item->object, |