From: Richard Levitte <levitte@openssl.org>
Date: Tue, 13 Nov 2018 17:49:21 +0000 (+0100)
Subject: Configuration: make sure the shared_sources table doesn't contain empty elements
X-Git-Tag: OpenSSL_1_1_1a~13
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0c594ccc29f6ba241627f436ba3d05fc400d1066;p=oweals%2Fopenssl.git

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)
---

diff --git a/Configure b/Configure
index c84722a4e6..b3328928df 100755
--- a/Configure
+++ b/Configure
@@ -2203,8 +2203,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}};