[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  7ad5fb6267e9da1634998bf2eccaa753f443fa83 (commit)
      from  f2b9c257216a27b568b3d5d703ca5bdd926c5c28 (commit)


- Log -----------------------------------------------------------------
commit 7ad5fb6267e9da1634998bf2eccaa753f443fa83
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Wed May 11 18:01:41 2016 -0400

    Fix TLSProxy race by adding missing eval
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 util/TLSProxy/Proxy.pm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/util/TLSProxy/Proxy.pm b/util/TLSProxy/Proxy.pm
index aafd902..950fd90 100644
--- a/util/TLSProxy/Proxy.pm
+++ b/util/TLSProxy/Proxy.pm
@@ -226,12 +226,14 @@ sub clientstart
     do {
         my $servaddr = $self->server_addr;
         $servaddr =~ s/[\[\]]//g; # Remove [ and ]
-        $server_sock = $IP_factory->(
-            PeerAddr => $servaddr,
-            PeerPort => $self->server_port,
-            MultiHomed => 1,
-            Proto => 'tcp'
-        );
+        eval {
+            $server_sock = $IP_factory->(
+                PeerAddr => $servaddr,
+                PeerPort => $self->server_port,
+                MultiHomed => 1,
+                Proto => 'tcp'
+            );
+        };
 
         $retry--;
         if ($@ || !defined($server_sock)) {