Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maint

diff --git a/git-send-email.perl b/git-send-email.perl
index c5a3f766f7fd34a48b352f3cfbb901840b4c4d5b..e907e0eacf31c21dcb75fa102eb980d6a51f96c3 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1136,7 +1136,7 @@ sub smtp_auth_maybe {
 
        # Check mechanism naming as defined in:
        # https://tools.ietf.org/html/rfc4422#page-8
-       if ($smtp_auth !~ /^(\b[A-Z0-9-_]{1,20}\s*)*$/) {
+       if ($smtp_auth && $smtp_auth !~ /^(\b[A-Z0-9-_]{1,20}\s*)*$/) {
                die "invalid smtp auth: '${smtp_auth}'";
        }
 
@@ -1365,7 +1365,11 @@ sub send_message {
                $smtp->mail( $raw_from ) or die $smtp->message;
                $smtp->to( @recipients ) or die $smtp->message;
                $smtp->data or die $smtp->message;
-               $smtp->datasend("$header\n$message") or die $smtp->message;
+               $smtp->datasend("$header\n") or die $smtp->message;
+               my @lines = split /^/, $message;
+               foreach my $line (@lines) {
+                       $smtp->datasend("$line") or die $smtp->message;
+               }
                $smtp->dataend() or die $smtp->message;
                $smtp->code =~ /250|200/ or die "Failed to send $subject\n".$smtp->message;
        }