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

diff --git a/lib/req.c b/lib/req.c
index 7bb37b4..662df0f 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') {
@@ -159,6 +164,72 @@ fail:
     return(-1);
 }
 
+struct hthead *parseresponse(FILE *in)
+{
+    struct hthead *req;
+    int code;
+    struct charbuf ver, msg;
+    int c;
+    
+    req = NULL;
+    bufinit(ver);
+    bufinit(msg);
+    code = 0;
+    while(1) {
+	c = getc(in);
+	if(c == ' ') {
+	    break;
+	} else if((c == EOF) || (c < 32) || (c >= 128)) {
+	    goto fail;
+	} else {
+	    bufadd(ver, c);
+	    if(ver.d >= 128)
+		goto fail;
+	}
+    }
+    while(1) {
+	c = getc(in);
+	if(c == ' ') {
+	    break;
+	} else if((c == EOF) || (c < '0') || (c > '9')) {
+	    goto fail;
+	} else {
+	    code = (code * 10) + (c - '0');
+	    if(code >= 10000)
+		goto fail;
+	}
+    }
+    while(1) {
+	c = getc(in);
+	if(c == 10) {
+	    break;
+	} else if(c == 13) {
+	} else if((c == EOF) || (c < 32)) {
+	    goto fail;
+	} else {
+	    bufadd(msg, c);
+	    if(msg.d >= 512)
+		goto fail;
+	}
+    }
+    bufadd(msg, 0);
+    bufadd(ver, 0);
+    req = mkresp(code, msg.b, ver.b);
+    if(parseheaders(req, in))
+	goto fail;
+    goto out;
+    
+fail:
+    if(req != NULL) {
+	freehthead(req);
+	req = NULL;
+    }
+out:
+    buffree(msg);
+    buffree(ver);
+    return(req);
+}
+
 void replrest(struct hthead *head, char *rest)
 {
     char *tmp;
@@ -200,7 +271,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 +325,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;