projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Off-by-one error in get_path_prefix(), found by Valgrind
[git.git]
/
git-send-email.perl
diff --git
a/git-send-email.perl
b/git-send-email.perl
index
d418d6c
..
7b1cca7
100755
(executable)
--- a/
git-send-email.perl
+++ b/
git-send-email.perl
@@
-21,7
+21,6
@@
use warnings;
use Term::ReadLine;
use Getopt::Long;
use Data::Dumper;
use Term::ReadLine;
use Getopt::Long;
use Data::Dumper;
-use Net::SMTP;
# most mail servers generate the Date: header, but not all...
$ENV{LC_ALL} = 'C';
# most mail servers generate the Date: header, but not all...
$ENV{LC_ALL} = 'C';
@@
-313,20
+312,19
@@
our ($message_id, $cc, %mail, $subject, $reply_to, $references, $message);
sub extract_valid_address {
my $address = shift;
sub extract_valid_address {
my $address = shift;
+ my $local_part_regexp = '[^<>"\s@]+';
+ my $domain_regexp = '[^.<>"\s@]+(?:\.[^.<>"\s@]+)+';
# check for a local address:
# check for a local address:
- return $address if ($address =~ /^(
[\w\-]+
)$/);
+ return $address if ($address =~ /^(
$local_part_regexp
)$/);
if ($have_email_valid) {
if ($have_email_valid) {
- return Email::Valid->address($address);
+ return
scalar
Email::Valid->address($address);
} else {
# less robust/correct than the monster regexp in Email::Valid,
# but still does a 99% job, and one less dependency
} else {
# less robust/correct than the monster regexp in Email::Valid,
# but still does a 99% job, and one less dependency
- my $cleaned_address;
- if ($address =~ /([^\"<>\s]+@[^<>\s]+)/) {
- $cleaned_address = $1;
- }
- return $cleaned_address;
+ $address =~ /($local_part_regexp\@$domain_regexp)/;
+ return $1;
}
}
}
}
@@
-387,11
+385,14
@@
X-Mailer: git-send-email $gitversion
my $pid = open my $sm, '|-';
defined $pid or die $!;
if (!$pid) {
my $pid = open my $sm, '|-';
defined $pid or die $!;
if (!$pid) {
- exec($smtp_server,'-i',@recipients) or die $!;
+ exec($smtp_server,'-i',
+ map { extract_valid_address($_) }
+ @recipients) or die $!;
}
print $sm "$header\n$message";
close $sm or die $?;
} else {
}
print $sm "$header\n$message";
close $sm or die $?;
} else {
+ require Net::SMTP;
$smtp ||= Net::SMTP->new( $smtp_server );
$smtp->mail( $from ) or die $smtp->message;
$smtp->to( @recipients ) or die $smtp->message;
$smtp ||= Net::SMTP->new( $smtp_server );
$smtp->mail( $from ) or die $smtp->message;
$smtp->to( @recipients ) or die $smtp->message;
@@
-420,7
+421,7
@@
X-Mailer: git-send-email $gitversion
}
$reply_to = $initial_reply_to;
}
$reply_to = $initial_reply_to;
-$references = $initial_reply_to;
+$references = $initial_reply_to
|| ''
;
make_message_id();
$subject = $initial_subject;
make_message_id();
$subject = $initial_subject;