[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  013aefc5f03c95f5366cc854ffb02b0df49af90d (commit)
      from  5f16ab333142de832555d3265aad243eb119b195 (commit)


- Log -----------------------------------------------------------------
commit 013aefc5f03c95f5366cc854ffb02b0df49af90d
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Nov 13 18:49:21 2018 +0100

    Configuration: make sure the shared_sources table doesn't contain empty elements
    
    Fixes #7634
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7635)
    
    (cherry picked from commit 0c594ccc29f6ba241627f436ba3d05fc400d1066)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configure b/Configure
index d85ff6a..a1ce652 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}};