]> granicus.if.org Git - php/commitdiff
- Fixed possible stack buffer overflow in FastCGI SAPI. (Andrey Nigmatulin)
authorDmitry Stogov <dmitry@php.net>
Thu, 3 Apr 2008 10:24:58 +0000 (10:24 +0000)
committerDmitry Stogov <dmitry@php.net>
Thu, 3 Apr 2008 10:24:58 +0000 (10:24 +0000)
- Fixed sending of uninitialized paddings which may contain some information.
  (Andrey Nigmatulin)

sapi/cgi/fastcgi.c

index ceb5edea9e08c54096295869c4b8fa772a2f3d4e..ed9afcea837699725eb9bc818ad8ce1d048b3527 100644 (file)
@@ -593,6 +593,9 @@ static inline int fcgi_make_header(fcgi_header *hdr, fcgi_request_type type, int
        hdr->reserved = 0;
        hdr->type = type;
        hdr->version = FCGI_VERSION_1;
+       if (pad) {
+               memset(((unsigned char*)hdr) + sizeof(fcgi_header) + len, 0, pad);
+       }
        return pad;
 }
 
@@ -777,7 +780,7 @@ int fcgi_read(fcgi_request *req, char *str, int len)
 {
        int ret, n, rest;
        fcgi_header hdr;
-       unsigned char buf[8];
+       unsigned char buf[255];
 
        n = 0;
        rest = len;