Changeset 5895

Timestamp:

03/21/10 03:27:29 (3 years ago)

Author:

jow

Message:

uhttpd: terminate I/O loops if socket writes fail

Location:

luci/trunk/contrib/package/uhttpd/src

Files:

• uhttpd-cgi.c (modified) (15 diffs)
• uhttpd-file.c (modified) (1 diff)

luci/trunk/contrib/package/uhttpd/src/uhttpd-cgi.c

@@ -119 +119 @@
 }
 
-static void uh_cgi_error_500(struct client *cl, struct http_request *req, const char *message)
+static int uh_cgi_error_500(struct client *cl, struct http_request *req, const char *message)
 {
-    uh_http_sendf(cl, NULL,
+    if( uh_http_sendf(cl, NULL,
         "HTTP/%.1f 500 Internal Server Error\r\n"
         "Content-Type: text/plain\r\n%s\r\n",
@@ -127 +127 @@
             (req->version > 1.0)
                 ? "Transfer-Encoding: chunked\r\n" : ""
-    );
-
-    uh_http_send(cl, req, message, -1);
+        ) >= 0
+    ) {
+        return uh_http_send(cl, req, message, -1);
+    }
+
+    return -1;
 }
 
@@ -348 +351 @@
 
             memset(hdr, 0, sizeof(hdr));
+
+#define ensure(x) \
+    do { if( x < 0 ) goto out; } while(0)
 
             /* I/O loop, watch our pipe ends and dispatch child reads/writes from/to socket */
@@ -391 +397 @@
 
                         /* there is no more post data, close pipe to child's stdin */
-                        else
+                        else if( content_length > -1 )
                         {
                             close(wfd[1]);
@@ -424 +430 @@
                                 {
                                     /* write status */
-                                    uh_http_sendf(cl, NULL, "HTTP/%.1f %03d %s\r\n",
-                                        req->version, res->statuscode, res->statusmsg);
+                                    ensure(uh_http_sendf(cl, NULL,
+                                        "HTTP/%.1f %03d %s\r\n",
+                                        req->version, res->statuscode,
+                                        res->statusmsg));
 
                                     /* add Content-Type if no Location or Content-Type */
@@ -431 +439 @@
                                         !uh_cgi_header_lookup(res, "Content-Type")
                                     ) {
-                                        uh_http_send(cl, NULL,
-                                            "Content-Type: text/plain\r\n", -1);
+                                        ensure(uh_http_send(cl, NULL,
+                                            "Content-Type: text/plain\r\n", -1));
                                     }
 
@@ -439 +447 @@
                                         !uh_cgi_header_lookup(res, "Transfer-Encoding")
                                     ) {
-                                        uh_http_send(cl, NULL,
-                                            "Transfer-Encoding: chunked\r\n", -1);
+                                        ensure(uh_http_send(cl, NULL,
+                                            "Transfer-Encoding: chunked\r\n", -1));
                                     }
 
@@ -446 +454 @@
                                     foreach_header(i, res->headers)
                                     {
-                                        uh_http_sendf(cl, NULL, "%s: %s\r\n",
-                                            res->headers[i], res->headers[i+1]);
+                                        ensure(uh_http_sendf(cl, NULL, "%s: %s\r\n",
+                                            res->headers[i], res->headers[i+1]));
                                     }
 
                                     /* terminate header */
-                                    uh_http_send(cl, NULL, "\r\n", -1);
+                                    ensure(uh_http_send(cl, NULL, "\r\n", -1));
 
                                     /* push out remaining head buffer */
                                     if( hdroff < hdrlen )
-                                        uh_http_send(cl, req, &hdr[hdroff], hdrlen - hdroff);
+                                        ensure(uh_http_send(cl, req, &hdr[hdroff], hdrlen - hdroff));
                                 }
 
@@ -461 +469 @@
                                 else if( hdrlen >= sizeof(hdr) )
                                 {
-                                    uh_cgi_error_500(cl, req,
-                                        "The CGI program generated an invalid response:\n\n");
-
-                                    uh_http_send(cl, req, hdr, hdrlen);
+                                    ensure(uh_cgi_error_500(cl, req,
+                                        "The CGI program generated an invalid response:\n\n"));
+
+                                    ensure(uh_http_send(cl, req, hdr, hdrlen));
                                 }
 
@@ -475 +483 @@
                                 /* push out remaining read buffer */
                                 if( bufoff < buflen )
-                                    uh_http_send(cl, req, &buf[bufoff], buflen - bufoff);
+                                    ensure(uh_http_send(cl, req, &buf[bufoff], buflen - bufoff));
 
                                 header_sent = 1;
@@ -483 +491 @@
 
                             /* headers complete, pass through buffer to socket */
-                            uh_http_send(cl, req, buf, buflen);
+                            ensure(uh_http_send(cl, req, buf, buflen));
                         }
 
@@ -503 +511 @@
                                  */
 
-                                uh_http_sendf(cl, NULL,
+                                ensure(uh_http_sendf(cl, NULL,
                                     "HTTP/%.1f 200 OK\r\n"
                                     "Content-Type: text/plain\r\n"
@@ -509 +517 @@
                                         req->version, (req->version > 1.0)
                                             ? "Transfer-Encoding: chunked\r\n" : ""
-                                );
-
-                                uh_http_send(cl, req, hdr, hdrlen);
+                                ));
+
+                                ensure(uh_http_send(cl, req, hdr, hdrlen));
                             }
 
                             /* send final chunk if we're in chunked transfer mode */
-                            uh_http_send(cl, req, "", 0);
+                            ensure(uh_http_send(cl, req, "", 0));
                             break;
                         }
@@ -524 +532 @@
                 else
                 {
-                    uh_http_sendhf(cl, 504, "Gateway Timeout",
-                        "The CGI script took too long to produce a response");
+                    ensure(uh_http_sendhf(cl, 504, "Gateway Timeout",
+                        "The CGI script took too long to produce a response"));
 
                     break;
@@ -531 +539 @@
             }
 
+        out:
             close(rfd[0]);
             close(wfd[1]);

luci/trunk/contrib/package/uhttpd/src/uhttpd-file.c

@@ -350 +350 @@
                 while( (rlen = read(fd, buf, sizeof(buf))) > 0 )
                 {
-                    uh_http_send(cl, req, buf, rlen);
+                    if( uh_http_send(cl, req, buf, rlen) < 0 )
+                        break;
                 }