bundle, fast-import: detect write failure

[git.git] / tag.c

diff --git a/tag.c b/tag.c
index 330d287924765c95dac428f040b104930c316b81..38bf9134f97c18973fe189c8703438f5e1135e49 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -26,7 +26,7 @@ struct tag *lookup_tag(const unsigned char *sha1)
        if (!obj->type)
                obj->type = OBJ_TAG;
         if (obj->type != OBJ_TAG) {
-                error("Object %s is a %s, not a tree",
+                error("Object %s is a %s, not a tag",
                       sha1_to_hex(sha1), typename(obj->type));
                 return NULL;
         }
@@ -39,6 +39,7 @@ int parse_tag_buffer(struct tag *item, void *data, unsigned long size)
        unsigned char sha1[20];
        const char *type_line, *tag_line, *sig_line;
        char type[20];
+       const char *start = data;
 
         if (item->object.parsed)
                 return 0;
@@ -53,11 +54,11 @@ int parse_tag_buffer(struct tag *item, void *data, unsigned long size)
        if (memcmp("\ntype ", type_line-1, 6))
                return -1;
 
-       tag_line = strchr(type_line, '\n');
+       tag_line = memchr(type_line, '\n', size - (type_line - start));
        if (!tag_line || memcmp("tag ", ++tag_line, 4))
                return -1;
 
-       sig_line = strchr(tag_line, '\n');
+       sig_line = memchr(tag_line, '\n', size - (tag_line - start));
        if (!sig_line)
                return -1;
        sig_line++;
@@ -68,9 +69,7 @@ int parse_tag_buffer(struct tag *item, void *data, unsigned long size)
        memcpy(type, type_line + 5, typelen);
        type[typelen] = '\0';
        taglen = sig_line - tag_line - strlen("tag \n");
-       item->tag = xmalloc(taglen + 1);
-       memcpy(item->tag, tag_line + 4, taglen);
-       item->tag[taglen] = '\0';
+       item->tag = xmemdupz(tag_line + 4, taglen);
 
        if (!strcmp(type, blob_type)) {
                item->tagged = &lookup_blob(sha1)->object;