treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / Address.pm

diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index 433b36ebb4ef4f38170d9ee6cb51972c12b9a6d3..f413c2f636b9af55dc815afda6936ceda5e05a28 100644 (file)
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -1,15 +1,18 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 package PublicInbox::Address;
 use strict;
 use warnings;
 
-sub xs_emails { map { $_->address() } parse_email_addresses($_[0]) }
+sub xs_emails {
+       grep { defined } map { $_->address() } parse_email_addresses($_[0])
+}
 
 sub xs_names {
-       map {
+       grep { defined } map {
                my $n = $_->name;
-               $n = $_->user if $n eq $_->address;
+               my $addr = $_->address;
+               $n = $_->user if defined($addr) && $n eq $addr;
                $n;
        } parse_email_addresses($_[0]);
 }