From: Andy Polyakov <appro@openssl.org>
Date: Thu, 12 Apr 2018 08:05:22 +0000 (+0200)
Subject: TLSProxy/Proxy.pm: straighten inner loop termination logic.
X-Git-Tag: OpenSSL_1_1_1-pre5~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4442061532fb1a98c22609bf37303b77716df624;p=oweals%2Fopenssl.git

TLSProxy/Proxy.pm: straighten inner loop termination logic.

Original condition was susceptible to race condition...

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5933)
---

diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index ea2c7a689e..9e9764d401 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -369,12 +369,14 @@ sub clientstart
     $fdset = IO::Select->new($server_sock, $client_sock);
     my @ready;
     my $ctr = 0;
+    my $sessionfile = $self->{sessionfile};
     local $SIG{PIPE} = "IGNORE";
-    while($fdset->count
-            && (!(TLSProxy::Message->end)
-                || (defined $self->sessionfile()
-                    && (-s $self->sessionfile()) == 0))
-            && $ctr < 10) {
+    while($fdset->count && $ctr < 10) {
+        if (defined($sessionfile)) {
+            # s_client got -ign_eof and won't be exiting voluntarily, so we
+            # look for data *and* check on session file...
+            last if TLSProxy::Message->success() && -s $sessionfile;
+        }
         if (!(@ready = $fdset->can_read(1))) {
             $ctr++;
             next;