From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 9 Sep 2010 20:15:02 +0000 (+0000)
Subject: uhttpd: break tight loop when receiving eof during header reading (#7904)
X-Git-Tag: reboot~18944
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=70dff7070ed289d1fd8078a3bf80713ed959b20d;p=openwrt%2Fstaging%2Fblogic.git

uhttpd: break tight loop when receiving eof during header reading (#7904)

SVN-Revision: 22988
---

diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 086c294580f1..e37fa90ec4de 100644
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=17
+PKG_RELEASE:=18
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_BUILD_DEPENDS := libcyassl liblua
diff --git a/package/uhttpd/src/uhttpd.c b/package/uhttpd/src/uhttpd.c
index 6f5e61634512..a818e1c4507e 100644
--- a/package/uhttpd/src/uhttpd.c
+++ b/package/uhttpd/src/uhttpd.c
@@ -401,6 +401,10 @@ static struct http_request * uh_http_header_recv(struct client *cl)
 			{
 				ensure_out(rlen = uh_tcp_recv(cl, bufptr, rlen));
 
+				/* unexpected eof - #7904 */
+				if( rlen == 0 )
+					return NULL;
+
 				blen -= rlen;
 				bufptr += rlen;
 			}