From: Robert Swiecki <robert@swiecki.net>
Date: Mon, 18 May 2015 23:08:02 +0000 (-0400)
Subject: Don't add write errors into bytecounts
X-Git-Tag: OpenSSL_1_0_1n~60
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e96de9822eea06f43d4104fc2d055d7895b08834;p=oweals%2Fopenssl.git

Don't add write errors into bytecounts

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 00d565cfbe90fab3b157e644caca4eb4a2ebec79)
---

diff --git a/apps/s_server.c b/apps/s_server.c
index 648dc6ab0a..093a80d583 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2251,8 +2251,10 @@ static int sv_body(char *hostname, int s, unsigned char *context)
                     ret = 1;
                     goto err;
                 }
-                l += k;
-                i -= k;
+                if (k > 0) {
+                    l += k;
+                    i -= k;
+                }
                 if (i <= 0)
                     break;
             }