Re: [PATCH] send-email: fix uninitialized var warning for $smtp_auth
From: Eric Sunshine <hidden>
Date: 2016-06-15 23:06:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
On Fri, Sep 18, 2015 at 03:12:50PM -0700, Brian Norris wrote:
quoted hunk ↗ jump to hunk
On the latest version of git-send-email, I see this error just before running SMTP auth (I didn't provide any --smtp-auth= parameter): Use of uninitialized value $smtp_auth in pattern match (m//) at /usr/local/google/home/briannorris/git/git/git-send-email.perl line 1139. Signed-off-by: Brian Norris <computersforpeace@gmail.com> --- git-send-email.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/git-send-email.perl b/git-send-email.perl index c5a3f766f7fd..e3ff44b4d0cd 100755 --- 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}'"; }
Thanks, makes sense. I wonder if moving the check to the point where $smtp_auth is actually used (despite the noisier diff) would be cleaner, like this:
--- 8< ---
diff --git a/git-send-email.perl b/git-send-email.perl
index c5a3f76..2a5ceda 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl@@ -1134,12 +1134,6 @@ sub smtp_auth_maybe { Authen::SASL->import(qw(Perl)); }; - # Check mechanism naming as defined in: - # https://tools.ietf.org/html/rfc4422#page-8 - if ($smtp_auth !~ /^(\b[A-Z0-9-_]{1,20}\s*)*$/) { - die "invalid smtp auth: '${smtp_auth}'"; - } - # TODO: Authentication may fail not because credentials were # invalid but due to other reasons, in which we should not # reject credentials.
@@ -1154,6 +1148,12 @@ sub smtp_auth_maybe { my $cred = shift; if ($smtp_auth) { + # Check mechanism naming as defined in: + # https://tools.ietf.org/html/rfc4422#page-8 + if ($smtp_auth !~ /^(\b[A-Z0-9-_]{1,20}\s*)*$/) { + die "invalid smtp auth: '${smtp_auth}'"; + } + my $sasl = Authen::SASL->new( mechanism => $smtp_auth, callback => { --- 8< ---