about summary refs log tree commit homepage
path: root/lib/PublicInbox/SearchMsg.pm
diff options
authorEric Wong <e@80x24.org>2016-05-25 01:44:46 +0000
committerEric Wong <e@80x24.org>2016-05-25 01:49:54 +0000
commit23a4e44bedabe5b8b651346cabc2a870c5377a30 (patch)
treee92220e935276cd1a2f466fa4bc6bf1e29fdb8e0 /lib/PublicInbox/SearchMsg.pm
parent64aea34d06f71828b0bdd6ae177b9bcf22d752b4 (diff)
git has stricter requirements for ident names (no '<>')
which Email::Address allows.

Even in 1.908, Email::Address also has an incomplete fix for
CVE-2015-7686 with a DoS-able regexp for comments.  Since we
don't care for or need all the RFC compliance of Email::Address,
avoiding it entirely may be preferable.

Email::Address will still be installed as a requirement for
Email::MIME, but it is only used by the
Email::MIME::header_str_set which we do not use
Diffstat (limited to 'lib/PublicInbox/SearchMsg.pm')
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index 1244aeea..0fb2a07e 100644
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -7,10 +7,10 @@ package PublicInbox::SearchMsg;
 use strict;
 use warnings;
 use Search::Xapian;
-use Email::Address qw//;
 use POSIX qw//;
 use Date::Parse qw/str2time/;
 use PublicInbox::MID qw/mid_clean/;
+use PublicInbox::Address;
 use Encode qw/find_encoding/;
 my $enc_utf8 = find_encoding('UTF-8');
 our $PFX2TERM_RE = undef;
@@ -87,9 +87,7 @@ sub from ($) {
         my ($self) = @_;
         my $from = __hdr($self, 'from');
         if (defined $from && !defined $self->{from_name}) {
-                $from =~ tr/\t\r\n/ /;
-                my @from = Email::Address->parse($from);
-                $self->{from_name} = $from[0]->name;
+                $self->{from_name} = PublicInbox::Address::from_name($from);