Fix util/perl/OpenSSL/Test.pm input variable overwrite

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4507)

diff --git a/util/perl/OpenSSL/Test.pm b/util/perl/OpenSSL/Test.pm
index ffbb1968d43e0747d01ba2dc8f2a7694cdb9a9cd..eb453a3290c418fb69dc7f016548f3058fde9266 100644 (file)
--- a/util/perl/OpenSSL/Test.pm
+++ b/util/perl/OpenSSL/Test.pm
@@ -905,9 +905,9 @@ sub __test_file {
 
     my $e = pop || "";
     my $f = pop;
 
     my $e = pop || "";
     my $f = pop;

-    $f = catfile($directories{BLDTEST},@_,$f . $e);
-    $f = catfile($directories{SRCTEST},@_,$f) unless -f $f;
-    return $f;
+    my $out = catfile($directories{BLDTEST},@_,$f . $e);
+    $out = catfile($directories{SRCTEST},@_,$f) unless -f $out;
+    return $out;

 }
 
 sub __apps_file {
 }
 
 sub __apps_file {


@@ -915,9 +915,9 @@ sub __apps_file {
 
     my $e = pop || "";
     my $f = pop;
 
     my $e = pop || "";
     my $f = pop;

-    $f = catfile($directories{BLDAPPS},@_,$f . $e);
-    $f = catfile($directories{SRCAPPS},@_,$f) unless -f $f;
-    return $f;
+    my $out = catfile($directories{BLDAPPS},@_,$f . $e);
+    $out = catfile($directories{SRCAPPS},@_,$f) unless -f $out;
+    return $out;

 }
 
 sub __fuzz_file {
 }
 
 sub __fuzz_file {


@@ -925,9 +925,9 @@ sub __fuzz_file {
 
     my $e = pop || "";
     my $f = pop;
 
     my $e = pop || "";
     my $f = pop;

-    $f = catfile($directories{BLDFUZZ},@_,$f . $e);
-    $f = catfile($directories{SRCFUZZ},@_,$f) unless -f $f;
-    return $f;
+    my $out = catfile($directories{BLDFUZZ},@_,$f . $e);
+    $out = catfile($directories{SRCFUZZ},@_,$f) unless -f $out;
+    return $out;

 }
 
 sub __data_file {
 }
 
 sub __data_file {