X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tag.c;h=38bf9134f97c18973fe189c8703438f5e1135e49;hb=95693d45ee1c1d4b76cac672636cf31229186a18;hp=f62bcdd994509323080683ce19c1a4d8241f9dec;hpb=bd8ff616c998da8b08bd59b47644408048b3016d;p=git.git

diff --git a/tag.c b/tag.c
index f62bcdd99..38bf9134f 100644
--- a/tag.c
+++ b/tag.c
@@ -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++;