diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-05 04:48:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-05 04:48:20 (GMT) |
| commit | 1d4a1f6452dee50576e1511e07d208da418b2c6b (patch) | |
| tree | 1353507b6a0aede5cc7da61a306cbd893332fbbd /tag.c | |
| parent | ac67aa5fd0ee5595ef803d23440c87e381c94109 (diff) | |
| parent | 7099153e8d7d0ed228c3a63cb06912c13c1082e5 (diff) | |
| download | git-1d4a1f6452dee50576e1511e07d208da418b2c6b.zip git-1d4a1f6452dee50576e1511e07d208da418b2c6b.tar.gz git-1d4a1f6452dee50576e1511e07d208da418b2c6b.tar.bz2 | |
Merge branch 'rs/tag-null-pointer-arith-fix'
Code clean-up.
* rs/tag-null-pointer-arith-fix:
tag: avoid NULL pointer arithmetic
Diffstat (limited to 'tag.c')
| -rw-r--r-- | tag.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -142,13 +142,13 @@ int parse_tag_buffer(struct tag *item, const void *data, unsigned long size) bufptr = nl + 1; if (!strcmp(type, blob_type)) { - item->tagged = &lookup_blob(&oid)->object; + item->tagged = (struct object *)lookup_blob(&oid); } else if (!strcmp(type, tree_type)) { - item->tagged = &lookup_tree(&oid)->object; + item->tagged = (struct object *)lookup_tree(&oid); } else if (!strcmp(type, commit_type)) { - item->tagged = &lookup_commit(&oid)->object; + item->tagged = (struct object *)lookup_commit(&oid); } else if (!strcmp(type, tag_type)) { - item->tagged = &lookup_tag(&oid)->object; + item->tagged = (struct object *)lookup_tag(&oid); } else { error("Unknown type %s", type); item->tagged = NULL; |