From: Dmitry Ivankov Date: Thu, 28 Jul 2011 05:44:02 GMT Subject: [PATCH 3/5] fast-import: check committer name more strictly Message-ID: <1311831844-13123-4-git-send-email-divanorama@gmail.com> In-Reply-To: <1311831844-13123-1-git-send-email-divanorama@gmail.com> Signed-off-by: Dmitry Ivankov --- fast-import.c | 29 +++++++++++++++++------------ t/t9300-fast-import.sh | 10 +++++----- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/fast-import.c b/fast-import.c index 3194f4e..419744f 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1968,7 +1968,7 @@ static int validate_raw_date(const char *src, char *result, int maxlen) static char *parse_ident(const char *buf) { - const char *gt; + const char *ltgt; size_t name_len; char *ident; @@ -1976,28 +1976,33 @@ static char *parse_ident(const char *buf) if (*buf == '<') --buf; - gt = strrchr(buf, '>'); - if (!gt) + ltgt = buf + strcspn(buf, "<>"); + if (*ltgt != '<') + die("Missing < in ident string: %s", buf); + if (ltgt != buf && ltgt[-1] != ' ') + die("Missing space before < in ident string: %s", buf); + ltgt = ltgt + 1 + strcspn(ltgt + 1, "<>"); + if (*ltgt != '>') die("Missing > in ident string: %s", buf); - gt++; - if (*gt != ' ') + ltgt++; + if (*ltgt != ' ') die("Missing space after > in ident string: %s", buf); - gt++; - name_len = gt - buf; + ltgt++; + name_len = ltgt - buf; ident = xmalloc(name_len + 24); strncpy(ident, buf, name_len); switch (whenspec) { case WHENSPEC_RAW: - if (validate_raw_date(gt, ident + name_len, 24) < 0) - die("Invalid raw date \"%s\" in ident: %s", gt, buf); + if (validate_raw_date(ltgt, ident + name_len, 24) < 0) + die("Invalid raw date \"%s\" in ident: %s", ltgt, buf); break; case WHENSPEC_RFC2822: - if (parse_date(gt, ident + name_len, 24) < 0) - die("Invalid rfc2822 date \"%s\" in ident: %s", gt, buf); + if (parse_date(ltgt, ident + name_len, 24) < 0) + die("Invalid rfc2822 date \"%s\" in ident: %s", ltgt, buf); break; case WHENSPEC_NOW: - if (strcmp("now", gt)) + if (strcmp("now", ltgt)) die("Date in ident must be 'now': %s", buf); datestamp(ident + name_len, 24); break; diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 09ef6ba..18441f8 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -370,7 +370,7 @@ data <