From: Willy Tarreau <w@1wt.eu>
Date: Fri, 17 Jan 2014 10:09:40 +0000 (+0100)
Subject: BUG/MAJOR: ssl: fix breakage caused by recent fix abf08d9
X-Git-Tag: v1.5-dev22~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00b0fb9349b8842a5ec2cee9dc4f286c8d3a3685;p=thirdparty%2Fhaproxy.git

BUG/MAJOR: ssl: fix breakage caused by recent fix abf08d9

Recent commit abf08d9 ("BUG/MAJOR: connection: fix mismatch between rcv_buf's
API and usage") accidentely broke SSL by relying on an uninitialized value to
enter the read loop.

Many thanks to Cyril Bonté and Steve Ruiz for reporting this issue.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 7120ff82a8..87a2a58514 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -1353,7 +1353,7 @@ static int ssl_sock_to_buf(struct connection *conn, struct buffer *buf, int coun
 	 * in which case we accept to do it once again. A new attempt is made on
 	 * EINTR too.
 	 */
-	while (try) {
+	while (count > 0) {
 		/* first check if we have some room after p+i */
 		try = buf->data + buf->size - (buf->p + buf->i);
 		/* otherwise continue between data and p-o */