X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=lib%2Freq.c;h=da8e3f0d8ffb463082a314762f4e1635bc2bc809;hp=7bb37b443ccb9ce17798175801cd85169801bf3f;hb=90b0ba0f9d93e454cc08a566b718abdcbfd0d9f6;hpb=f89ce57a7d216566b30c22f8f8accc9ab0eb5c6c

diff --git a/lib/req.c b/lib/req.c
index 7bb37b4..da8e3f0 100644
--- a/lib/req.c
+++ b/lib/req.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <fcntl.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -105,12 +106,16 @@ int parseheaders(struct hthead *head, FILE *in)
 {
     int c, state;
     struct charbuf name, val;
+    size_t tsz;
     
     bufinit(name);
     bufinit(val);
     state = 0;
+    tsz = 0;
     while(1) {
 	c = fgetc(in);
+	if(++tsz >= 65536)
+	    goto fail;
     again:
 	if(state == 0) {
 	    if(c == '\r') {
@@ -200,7 +205,7 @@ void headrmheader(struct hthead *head, const char *name)
 	    free(head->headers[i][0]);
 	    free(head->headers[i][1]);
 	    free(head->headers[i]);
-	    memmove(head->headers + i, head->headers + i + 1, --head->noheaders - i);
+	    memmove(head->headers + i, head->headers + i + 1, sizeof(head->headers) * (--head->noheaders - i));
 	    return;
 	}
     }
@@ -254,6 +259,7 @@ int recvreq(int sock, struct hthead **reqp)
     if((fd = recvfd(sock, &buf.b, &buf.d)) < 0) {
 	return(-1);
     }
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
     buf.s = buf.d;
     p = buf.b;
     l = buf.d;