GIT 0.99.9l aka 1.0rc4

diff --git a/mktag.c b/mktag.c
index aa4a6d863bfb9e091b900470de2d03fa431bbfe2..97e270a5761f071aeb3666b595b5cd6a8cbd4098 100644 (file)
--- a/mktag.c
+++ b/mktag.c
@@ -42,7 +42,7 @@ static int verify_tag(char *buffer, unsigned long size)
        int typelen;
        char type[20];
        unsigned char sha1[20];
-       const char *object, *type_line, *tag_line;
+       const char *object, *type_line, *tag_line, *tagger_line;
 
        if (size < 64 || size > MAXSIZE-1)
                return -1;
@@ -92,6 +92,12 @@ static int verify_tag(char *buffer, unsigned long size)
                return -1;
        }
 
+       /* Verify the tagger line */
+       tagger_line = tag_line;
+
+       if (memcmp(tagger_line, "tagger", 6) || (tagger_line[6] == '\n'))
+               return -1;
+
        /* The actual stuff afterwards we don't care about.. */
        return 0;
 }
@@ -105,10 +111,23 @@ int main(int argc, char **argv)
        if (argc != 1)
                usage("cat <signaturefile> | git-mktag");
 
+       setup_git_directory();
+
        // Read the signature
-       size = read(0, buffer, MAXSIZE);
+       size = 0;
+       for (;;) {
+               int ret = read(0, buffer + size, MAXSIZE - size);
+               if (!ret)
+                       break;
+               if (ret < 0) {
+                       if (errno == EAGAIN)
+                               continue;
+                       break;
+               }
+               size += ret;
+       }
 
-       // Verify it for some basic sanity: it needs to start with "object <sha1>\ntype "
+       // Verify it for some basic sanity: it needs to start with "object <sha1>\ntype\ntagger "
        if (verify_tag(buffer, size) < 0)
                die("invalid tag signature file");