public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Configure: use $list_separator_re only for defines and includes

Browse source 
This regexp was used a bit too uncontrolled, which had it split flag
values where it should not have.

Fixes #10792

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10793)
This commit is contained in:
Richard Levitte 2020-01-09 14:49:53 +01:00
parent 42b3f10b5e
commit bbe486cf61
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Configure
View file

@ -590,7 +590,7 @@ while ((my $first, my $second) = (shift @list, shift @list)) {
&usage if ($#ARGV < 0); &usage if ($#ARGV < 0);
# For the "make variables" CINCLUDES and CDEFINES, we support lists with # For the "make variables" CPPINCLUDES and CPPDEFINES, we support lists with
# platform specific list separators. Users from those platforms should # platform specific list separators. Users from those platforms should
# recognise those separators from how you set up the PATH to find executables. # recognise those separators from how you set up the PATH to find executables.
# The default is the Unix like separator, :, but as an exception, we also # The default is the Unix like separator, :, but as an exception, we also
@ -1030,7 +1030,11 @@ foreach (keys %user) {
if (defined $value) { if (defined $value) {
if (ref $user{$_} eq 'ARRAY') { if (ref $user{$_} eq 'ARRAY') {
$user{$_} = [ split /$list_separator_re/, $value ]; if ($_ eq 'CPPDEFINES' || $_ eq 'CPPINCLUDES') {
$user{$_} = [ split /$list_separator_re/, $value ];
} else {
$user{$_} = [ $value ];
}
} elsif (!defined $user{$_}) { } elsif (!defined $user{$_}) {
$user{$_} = $value; $user{$_} = $value;
} }