getpwuid() fragility continues.

p4raw-id: //depot/perl@12589

1 files changed, 8 insertions, 6 deletions

diff --git a/utils/h2xs.PL b/utils/h2xs.PL
index 2a7b1c42e1..2b36af042f 100644
--- a/utils/h2xs.PL
+++ b/utils/h2xs.PL
@@ -1052,12 +1052,14 @@ END
 my ($email,$author);
 
 eval {
-       my $user;
-       ($user,$author) = (getpwuid($>))[0,6];
-       $author =~ s/,.*$//; # in case of sub fields
-       my $domain = $Config{'mydomain'};
-       $domain =~ s/^\.//;
-       $email = "$user\@$domain";
+       my $username;
+       ($username,$author) = (getpwuid($>))[0,6];
+       if (defined $username && defined $author) {
+	   $author =~ s/,.*$//; # in case of sub fields
+	   my $domain = $Config{'mydomain'};
+	   $domain =~ s/^\.//;
+	   $email = "$username\@$domain";
+       }
      };
 
 $author ||= "A. U. Thor";