From d46f357c887a5856241f673bf7a328d79b8dfa16 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Tue, 6 Dec 2011 00:16:52 +0100 Subject: [PATCH] Harden against Iceweasel bug: read until we find a newline. --- webcit/tcp_sockets.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c index c9d053f2f..7db07943d 100644 --- a/webcit/tcp_sockets.c +++ b/webcit/tcp_sockets.c @@ -448,7 +448,8 @@ int ClientGetLine(ParsedHttpHdrs *Hdr, StrBuf *Target) if (is_https) { int ntries = 0; - if (StrLength(Hdr->ReadBuf) > 0) { + if (StrLength(Hdr->ReadBuf) > 0) + { pchs = ChrPtr(Hdr->ReadBuf); pch = strchr(pchs, '\n'); if (pch != NULL) { @@ -471,6 +472,8 @@ int ClientGetLine(ParsedHttpHdrs *Hdr, StrBuf *Target) retval = client_read_sslbuffer(Hdr->ReadBuf, SLEEPING); pchs = ChrPtr(Hdr->ReadBuf); pch = strchr(pchs, '\n'); + if (pch == NULL) + retval = 0; } if (retval == 0) { sleeeeeeeeeep(1); -- 2.30.2