[PATCH/RFC 1/6] tag: read signature
From: Marc-André Lureau <hidden>
Date: 2016-06-15 22:46:15
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Marc-Andre Lureau <redacted> --- tag.c | 11 ++++++++--- tag.h | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/tag.c b/tag.c
index 4470d2b..42e5b22 100644
--- a/tag.c
+++ b/tag.c@@ -38,9 +38,9 @@ struct tag *lookup_tag(const unsigned char *sha1) int parse_tag_buffer(struct tag *item, void *data, unsigned long size) { - int typelen, taglen; + int typelen, taglen, siglen; unsigned char sha1[20]; - const char *type_line, *tag_line, *sig_line; + const char *type_line, *tag_line, *sig_line, *msg_line; char type[20]; const char *start = data;
@@ -62,9 +62,12 @@ int parse_tag_buffer(struct tag *item, void *data,unsigned long size)
return -1;
sig_line = memchr(tag_line, '\n', size - (tag_line - start));
+ if (!sig_line || memcmp("tagger ", ++sig_line, 7))
+ return -1;
+
+ msg_line = memchr(sig_line, '\n', size - (sig_line - start));
if (!sig_line)
return -1;
- sig_line++;
typelen = tag_line - type_line - strlen("type \n");
if (typelen >= 20)@@ -73,6 +76,8 @@ int parse_tag_buffer(struct tag *item, void *data,unsigned long size)
type[typelen] = '\0';
taglen = sig_line - tag_line - strlen("tag \n");
item->tag = xmemdupz(tag_line + 4, taglen);
+ siglen = msg_line - sig_line - strlen("tagger \n");
+ item->signature = xmemdupz(sig_line + 7, siglen);
if (!strcmp(type, blob_type)) {
item->tagged = &lookup_blob(sha1)->object;diff --git a/tag.h b/tag.h
index 7a0cb00..bc2cab3 100644
--- a/tag.h
+++ b/tag.h@@ -9,7 +9,7 @@ struct tag { struct object object; struct object *tagged; char *tag; - char *signature; /* not actually implemented */ + char *signature; }; extern struct tag *lookup_tag(const unsigned char *sha1);
--
1.6.2.rc1.28.g05ef4.dirty