X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=mktag.c;h=585677eb83cd0fd21963d21291a6af2b54fc9c84;hb=b17e659dd4007cb1d3eb5ac32b524c0c5ab59601;hp=aa4a6d863bfb9e091b900470de2d03fa431bbfe2;hpb=91d7b8afc2dc8bacde2012ad076cd8d0c4d36697;p=git.git

diff --git a/mktag.c b/mktag.c
index aa4a6d86..585677eb 100644
--- 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;
 }
@@ -106,9 +112,20 @@ int main(int argc, char **argv)
 		usage("cat <signaturefile> | git-mktag");
 
 	// 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");