diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-09-10 18:13:34 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-09-10 18:14:46 +0200 |
| commit | 76e3c43fb99eb75cf33affb1a93260af4d472da5 (patch) | |
| tree | fcb4c2fa8629c5715dfe5f46a5723418909c05fa | |
| parent | 31e752b6546537bbeee89b6d2f3027cf0eff9a53 (diff) | |
| download | libgit2-cmn/signature-empty-email.tar.gz | |
signature: don't allow empty emailscmn/signature-empty-email
A signature is made up of a non-empty name and a non-empty email so
let's validate that. This also brings us more in line with git, which
also rejects ident with an empty email.
| -rw-r--r-- | src/signature.c | 4 | ||||
| -rw-r--r-- | tests/commit/signature.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/signature.c b/src/signature.c index 2545b7519..2a16b484a 100644 --- a/src/signature.c +++ b/src/signature.c @@ -70,9 +70,9 @@ int git_signature_new(git_signature **sig_out, const char *name, const char *ema if (p->name == NULL || p->email == NULL) return -1; /* oom */ - if (p->name[0] == '\0') { + if (p->name[0] == '\0' || p->email[0] == '\0') { git_signature_free(p); - return signature_error("Signature cannot have an empty name"); + return signature_error("Signature cannot have an empty name or email"); } p->when.time = time; diff --git a/tests/commit/signature.c b/tests/commit/signature.c index e9dcfab41..41a74b999 100644 --- a/tests/commit/signature.c +++ b/tests/commit/signature.c @@ -56,8 +56,8 @@ void test_commit_signature__create_empties(void) cl_git_fail(try_build_signature("", "emeric.fermas@gmail.com", 1234567890, 60)); cl_git_fail(try_build_signature(" ", "emeric.fermas@gmail.com", 1234567890, 60)); - cl_git_pass(try_build_signature("nulltoken", "", 1234567890, 60)); - cl_git_pass(try_build_signature("nulltoken", " ", 1234567890, 60)); + cl_git_fail(try_build_signature("nulltoken", "", 1234567890, 60)); + cl_git_fail(try_build_signature("nulltoken", " ", 1234567890, 60)); } void test_commit_signature__create_one_char(void) |