summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-11-13 18:49:21 +0100
committerRichard Levitte <levitte@openssl.org>2018-11-13 23:53:54 +0100
commit013aefc5f03c95f5366cc854ffb02b0df49af90d (patch)
treec1b84a80b8e3d4a272eaaed9e32cfc3dbbc2a596
parent5f16ab333142de832555d3265aad243eb119b195 (diff)
Configuration: make sure the shared_sources table doesn't contain empty elements
Fixes #7634 Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7635) (cherry picked from commit 0c594ccc29f6ba241627f436ba3d05fc400d1066)
-rwxr-xr-xConfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/Configure b/Configure
index d85ff6aa4d..a1ce65239e 100755
--- a/Configure
+++ b/Configure
@@ -1906,8 +1906,8 @@ EOF
next unless defined($unified_info{includes}->{$dest}->{$k});
my @incs = reverse @{$unified_info{includes}->{$dest}->{$k}};
foreach my $obj (grep /\.o$/,
- (keys %{$unified_info{sources}->{$dest}},
- keys %{$unified_info{shared_sources}->{$dest}})) {
+ (keys %{$unified_info{sources}->{$dest} // {}},
+ keys %{$unified_info{shared_sources}->{$dest} // {}})) {
foreach my $inc (@incs) {
unshift @{$unified_info{includes}->{$obj}->{$k}}, $inc
unless grep { $_ eq $inc } @{$unified_info{includes}->{$obj}->{$k}};