Check the output from passdata in htparser.

[ashd.git] / src / htparser.c

diff --git a/src/htparser.c b/src/htparser.c
index 4924b98..07f3dd6 100644 (file)
--- a/src/htparser.c
+++ b/src/htparser.c
@@ -300,6 +300,7 @@ static void serve(struct muth *muth, va_list args)
     vavar(int, fd);
     vavar(struct sockaddr_storage, name);
     int cfd;
+    int pfds[2];
     char old;
     char *hd, *p;
     struct charbuf inbuf, outbuf;
@@ -352,16 +353,22 @@ static void serve(struct muth *muth, va_list args)
        }
        if(block(plex, EV_WRITE, 60) <= 0)
            goto out;
-       if((cfd = sendreq(plex, req)) < 0)
+       if(socketpair(PF_UNIX, SOCK_STREAM, 0, pfds))
            goto out;
+       if(sendreq(plex, req, pfds[0]))
+           goto out;
+       close(pfds[0]);
+       cfd = pfds[1];
 
        /*
         * If there is message data, pass it:
         */
        if((hd = getheader(req, "content-length")) != NULL) {
            dlen = atoo(hd);
-           if(dlen > 0)
-               passdata(fd, cfd, &inbuf, dlen);
+           if(dlen > 0) {
+               if(passdata(fd, cfd, &inbuf, dlen) < 0)
+                   goto out;
+           }
        }
        /* Make sure to send EOF */
        shutdown(cfd, SHUT_WR);
@@ -381,7 +388,8 @@ static void serve(struct muth *muth, va_list args)
         * Pass the actual output:
         */
        sizebuf(outbuf, 65536);
-       sent = passdata(cfd, fd, &outbuf, -1);
+       if((sent = passdata(cfd, fd, &outbuf, -1)) < 0)
+           goto out;
        sent -= headoff;
        
        /*