X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=tag.c;h=3a71dd416ad18d86ed28ed6593e4588151cc43ea;hb=e0965d83c533e8b6a51f1c6c1be12f5edee5ca65;hp=406dba2aa5607332fe022fcba1beb045fa61c5f4;hpb=ae200ee594545be43ed9dfb51c9db8e1a014a8f5;p=git.git diff --git a/tag.c b/tag.c index 406dba2a..3a71dd41 100644 --- a/tag.c +++ b/tag.c @@ -37,37 +37,46 @@ int parse_tag(struct tag *item) if (!data) return error("Could not read %s", sha1_to_hex(item->object.sha1)); - if (strcmp(type, tag_type)) + if (strcmp(type, tag_type)) { + free(data); return error("Object %s not a tag", sha1_to_hex(item->object.sha1)); + } if (size < 64) - return -1; + goto err; if (memcmp("object ", data, 7) || get_sha1_hex(data + 7, object)) - return -1; + goto err; item->tagged = parse_object(object); + if (item->tagged) + add_ref(&item->object, item->tagged); type_line = data + 48; if (memcmp("\ntype ", type_line-1, 6)) - return -1; + goto err; tag_line = strchr(type_line, '\n'); if (!tag_line || memcmp("tag ", ++tag_line, 4)) - return -1; + goto err; sig_line = strchr(tag_line, '\n'); if (!sig_line) - return -1; + goto err; sig_line++; typelen = tag_line - type_line - strlen("type \n"); if (typelen >= 20) - return -1; + goto err; taglen = sig_line - tag_line - strlen("tag \n"); item->tag = xmalloc(taglen + 1); memcpy(item->tag, tag_line + 4, taglen); item->tag[taglen] = '\0'; + free(data); return 0; + +err: + free(data); + return -1; }