diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-02-16 23:28:31 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-02-19 11:14:54 +0000 |
| commit | d615c80a4fe12a983380106bd3b4c6b34bf8d982 (patch) | |
| tree | c60ef7a0c3a19fba9ebbf53095ce16fb34b3d9d7 /util | |
| parent | ed1306451f702aae629ccc39d826a96836b3b069 (diff) | |
OpenSSL::Test::quotify: put quotes around empty arguments
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5396)
(cherry picked from commit 5845f7de8165f35829e49acd41f6a2fc3698f221)
Diffstat (limited to 'util')
| -rw-r--r-- | util/perl/OpenSSL/Test.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/util/perl/OpenSSL/Test.pm b/util/perl/OpenSSL/Test.pm index f8805a6db0..eacbd68170 100644 --- a/util/perl/OpenSSL/Test.pm +++ b/util/perl/OpenSSL/Test.pm @@ -667,12 +667,13 @@ I<This must never ever be done on VMS.> sub quotify { # Unix setup (default if nothing else is mentioned) my $arg_formatter = - sub { $_ = shift; /\s|[\{\}\\\$\[\]\*\?\|\&:;<>]/ ? "'$_'" : $_ }; + sub { $_ = shift; + ($_ eq '' || /\s|[\{\}\\\$\[\]\*\?\|\&:;<>]/) ? "'$_'" : $_ }; if ( $^O eq "VMS") { # VMS setup $arg_formatter = sub { $_ = shift; - if (/\s|["[:upper:]]/) { + if ($_ eq '' || /\s|["[:upper:]]/) { s/"/""/g; '"'.$_.'"'; } else { @@ -682,7 +683,7 @@ sub quotify { } elsif ( $^O eq "MSWin32") { # MSWin setup $arg_formatter = sub { $_ = shift; - if (/\s|["\|\&\*\;<>]/) { + if ($_ eq '' || /\s|["\|\&\*\;<>]/) { s/(["\\])/\\$1/g; '"'.$_.'"'; } else { |