From b4e293558266d9ae2f7971c682ac0846972005f8 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <PromyLOPh@lavabit.com>
Date: Fri, 5 Mar 2010 18:08:11 +0100
Subject: waitress: Abort reading if server closes connection

Caused infinite loops under certain circumstances.
---
 libwaitress/src/waitress.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libwaitress/src/waitress.c')

diff --git a/libwaitress/src/waitress.c b/libwaitress/src/waitress.c
index 26ed493..70a1547 100644
--- a/libwaitress/src/waitress.c
+++ b/libwaitress/src/waitress.c
@@ -394,6 +394,10 @@ WaitressReturn_t WaitressFetchCall (WaitressHandle_t *waith) {
 	nextLine = recvBuf;
 	while (hdrParseMode != HDRM_FINISHED) {
 		READ_RET (recvBuf+bufFilled, sizeof (recvBuf)-1 - bufFilled, &recvSize);
+		if (recvSize == 0) {
+			/* connection closed too early */
+			CLOSE_RET (WAITRESS_RET_CONNECTION_CLOSED);
+		}
 		bufFilled += recvSize;
 		memset (recvBuf+bufFilled, 0, sizeof (recvBuf) - bufFilled);
 		thisLine = recvBuf;
-- 
cgit v1.2.3