From: Richard Levitte <levitte@openssl.org>
Date: Sun, 1 Dec 2019 07:20:09 +0000 (+0100)
Subject: configdata.pm.in: Don't try to quotify undefined values
X-Git-Tag: openssl-3.0.0-alpha1~867
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=278de77b881739267d86f96088557af3da966982;p=oweals%2Fopenssl.git

configdata.pm.in: Don't try to quotify undefined values

Fixes #10503

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10548)
---

diff --git a/configdata.pm.in b/configdata.pm.in
index 312122686f..71627b48ef 100644
--- a/configdata.pm.in
+++ b/configdata.pm.in
@@ -245,7 +245,13 @@ _____
         foreach (sort keys %target) {
             next if $_ =~ m|^_| || $_ eq 'template';
             my $quotify = sub {
-                map { (my $x = $_) =~ s|([\\\$\@"])|\\$1|g; "\"$x\""} @_;
+                map {
+                    if (defined $_) {
+                        (my $x = $_) =~ s|([\\\$\@"])|\\$1|g; "\"$x\""
+                    } else {
+                        "undef";
+                    }
+                } @_;
             };
             print '    ', $_, ' => ';
             if (ref($target{$_}) eq "ARRAY") {