git-send-email: fix fallback code in extract_valid_address()
In the fallback check, used when Email::Valid is not available, the extract_valid_address() uses $1 without checking for success of matching regex. The $1 variable may still hold the result of previous match, which is the address when email address was in '<>' or be undefined otherwise. Now if match fails undefined value is always returned to indicate error. The same value is used by Email::Valid->address() in that case. Previously 'foo@bar' address was rejected by Email::Valid and fallback, but '<foo@bar>' was rejected by Email::Valid, but accepted by fallback. Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Krzysztof Mazur committed
Nov 22, 2012 at 19:12 UTC
95c0d4b68a0fcba3adf45ce3a8f1edf99a9030a1
1 file changed
+5
-5
git-send-email.perl
+5
-5
@@ -831,12 +831,12 @@ sub extract_valid_address {
831
$address =~ s/^\s*<(.*)>\s*$/$1/;
832
if ($have_email_valid) {
833
return scalar Email::Valid->address($address);
834
- } else {
835
- # less robust/correct than the monster regexp in Email::Valid,
836
- # but still does a 99% job, and one less dependency
837
- $address =~ /($local_part_regexp\@$domain_regexp)/;
838
- return $1;
834
}
835
+
836
+ # less robust/correct than the monster regexp in Email::Valid,
837
+ # but still does a 99% job, and one less dependency
838
+ return $1 if $address =~ /($local_part_regexp\@$domain_regexp)/;
839
+ return undef;
840
}
841
842
# Usually don't need to change anything below here.