1 files changed, 10 insertions, 8 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index 50e832c1f..53be500d3 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1194,7 +1194,8 @@ static void send_headers_and_exit(int responseNum)
 }
 /*
- * Read from the socket until '\n' or EOF. '\r' chars are removed.
+ * Read from the socket until '\n' or EOF.
+ * '\r' chars are removed.
 * '\n' is replaced with NUL.
 * Return number of characters read or 0 if nothing is read
 * ('\r' and '\n' are not counted).
@@ -1202,29 +1203,30 @@ static void send_headers_and_exit(int responseNum)
 */
 static int get_line(void)
 {
-        int count = 0;
+        int count;
        char c;
        alarm(HEADER_READ_TIMEOUT);
+        count = 0;
        while (1) {
                if (hdr_cnt <= 0) {
                        hdr_cnt = safe_read(STDIN_FILENO, hdr_buf, sizeof_hdr_buf);
                        if (hdr_cnt <= 0)
-                                break;
+                                goto ret;
                        hdr_ptr = hdr_buf;
                }
-                iobuf[count] = c = *hdr_ptr++;
                hdr_cnt--;
+                c = *hdr_ptr++;
                if (c == '\r')
                        continue;
-                if (c == '\n') {
+                if (c == '\n')
-                        iobuf[count] = '\0';
                        break;
-                }
+                iobuf[count] = c;
                if (count < (IOBUF_SIZE - 1))      /* check overflow */
                        count++;
        }
+ ret:
+        iobuf[count] = '\0';
        return count;
 }

diff --git a/networking/httpd.c b/networking/httpd.c index 50e832c1f..53be500d3 100644 --- a/networking/httpd.c +++ b/networking/httpd.c
@@ -1194,7 +1194,8 @@ static void send_headers_and_exit(int responseNum)
1194	}	1194	}
1195		1195
1196	/*	1196	/*
1197	* Read from the socket until '\n' or EOF. '\r' chars are removed.	1197	* Read from the socket until '\n' or EOF.
		1198	* '\r' chars are removed.
1198	* '\n' is replaced with NUL.	1199	* '\n' is replaced with NUL.
1199	* Return number of characters read or 0 if nothing is read	1200	* Return number of characters read or 0 if nothing is read
1200	* ('\r' and '\n' are not counted).	1201	* ('\r' and '\n' are not counted).
@@ -1202,29 +1203,30 @@ static void send_headers_and_exit(int responseNum)
1202	*/	1203	*/
1203	static int get_line(void)	1204	static int get_line(void)
1204	{	1205	{
1205	int count = 0;	1206	int count;
1206	char c;	1207	char c;
1207		1208
1208	alarm(HEADER_READ_TIMEOUT);	1209	alarm(HEADER_READ_TIMEOUT);
		1210	count = 0;
1209	while (1) {	1211	while (1) {
1210	if (hdr_cnt <= 0) {	1212	if (hdr_cnt <= 0) {
1211	hdr_cnt = safe_read(STDIN_FILENO, hdr_buf, sizeof_hdr_buf);	1213	hdr_cnt = safe_read(STDIN_FILENO, hdr_buf, sizeof_hdr_buf);
1212	if (hdr_cnt <= 0)	1214	if (hdr_cnt <= 0)
1213	break;	1215	goto ret;
1214	hdr_ptr = hdr_buf;	1216	hdr_ptr = hdr_buf;
1215	}	1217	}
1216	iobuf[count] = c = *hdr_ptr++;
1217	hdr_cnt--;	1218	hdr_cnt--;
1218		1219	c = *hdr_ptr++;
1219	if (c == '\r')	1220	if (c == '\r')
1220	continue;	1221	continue;
1221	if (c == '\n') {	1222	if (c == '\n')
1222	iobuf[count] = '\0';
1223	break;	1223	break;
1224	}	1224	iobuf[count] = c;
1225	if (count < (IOBUF_SIZE - 1)) /* check overflow */	1225	if (count < (IOBUF_SIZE - 1)) /* check overflow */
1226	count++;	1226	count++;
1227	}	1227	}
		1228	ret:
		1229	iobuf[count] = '\0';
1228	return count;	1230	return count;
1229	}	1231	}
1230		1232