[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  00d565cfbe90fab3b157e644caca4eb4a2ebec79 (commit)
      from  6383d31645c6381817f26e2997b8bf58ec903edb (commit)


- Log -----------------------------------------------------------------
commit 00d565cfbe90fab3b157e644caca4eb4a2ebec79
Author: Robert Swiecki <robert at swiecki.net>
Date:   Mon May 18 19:08:02 2015 -0400

    Don't add write errors into bytecounts
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 apps/s_server.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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