Re: [PATCH] git-send-email: don't return undefined value in extract_valid_address()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Krzysztof Mazur <krzysiek@xxxxxxxxxxxx> writes:

> In the fallback check, when Email::Valid is not available, the
> extract_valid_address() does not check for success of matching regex,
> and $1, which can be undefined, is always returned. Now if match
> fails an empty string is returned.

That much we can read from the code, but a bigger question is why
would it be a good thing for the callers?  Wouldn't they want to
be able to distinguish a failure from an empty string?

> Signed-off-by: Krzysztof Mazur <krzysiek@xxxxxxxxxxxx>
> ---
> This fixes following warnings:
> Use of uninitialized value in string eq at ./git-send-email.perl line 1017.
> Use of uninitialized value in quotemeta at ./git-send-email.perl line 1017.
> W: unable to extract a valid address from: x a.patch
>
> when invalid email address was added by --cc-cmd,
> ./git-send-email.perl --dry-run --to a@xxxxxxxxxxxx --cc-cmd=echo x a.patch

In other words, would we want to *hide* (not "fix") the warning?
Shouldn't we be barfing loudly and possibly erroring it out until
the user fixes her --cc-cmd?

>  git-send-email.perl | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/git-send-email.perl b/git-send-email.perl
> index 5a7c29d..045f25f 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -831,12 +831,12 @@ sub extract_valid_address {
>  	$address =~ s/^\s*<(.*)>\s*$/$1/;
>  	if ($have_email_valid) {
>  		return scalar Email::Valid->address($address);
> -	} else {
> -		# less robust/correct than the monster regexp in Email::Valid,
> -		# but still does a 99% job, and one less dependency
> -		$address =~ /($local_part_regexp\@$domain_regexp)/;
> -		return $1;
>  	}
> +
> +	# less robust/correct than the monster regexp in Email::Valid,
> +	# but still does a 99% job, and one less dependency
> +	return $1 if $address =~ /($local_part_regexp\@$domain_regexp)/;
> +	return "";
>  }
>  
>  # Usually don't need to change anything below here.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]