Changeset 1731

Timestamp:

04/09/2007 07:58:57 PM (17 months ago)

Author:

jan

Message:

- fixed various crashes at startup on broken accesslog.format strings

(fixes #1000)

- fixed handling of %% in accesslog.format

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/mod_accesslog.c (modified) (8 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -29 +29 @@
   * fixed accesslog.use-syslog in a conditional and the caching of the
     accesslog for files (fixes #1064)
+  * fixed various crashes at startup on broken accesslog.format strings (#1000)
+  * fixed handling of %% in accesslog.format 
 
 

branches/lighttpd-1.4.x/src/mod_accesslog.c

@@ -160 +160 @@
         size_t i, j, k = 0, start = 0;
 
+        if (format->used == 0) return -1;
+
         for (i = 0; i < format->used - 1; i++) {
-
                 switch(format->ptr[i]) {
                 case '%':
-                        if (start != i) {
-                                /* copy the string */
+                        if (i > 0 && start != i) {
+                                /* copy the string before this % */
                                 if (fields->size == 0) {
                                         fields->size = 16;
@@ -184 +185 @@
                         }
 
-
                         /* we need a new field */
 
@@ -200 +200 @@
                         case '>':
                         case '<':
-                                /* only for s */
+                                /* after the } has to be a character */
+                                if (format->ptr[i+2] == '\0') {
+                                        log_error_write(srv, __FILE__, __LINE__, "s", "%< and %> have to be followed by a format-specifier");
+                                        return -1;
+                                }
+
 
                                 for (j = 0; fmap[j].key != '\0'; j++) {
@@ -218 +223 @@
 
                                 if (fmap[j].key == '\0') {
-                                        log_error_write(srv, __FILE__, __LINE__, "ss", "config: ", "failed");
+                                        log_error_write(srv, __FILE__, __LINE__, "s", "%< and %> have to be followed by a valid format-specifier");
                                         return -1;
                                 }
 
                                 start = i + 3;
+                                i = start - 1; /* skip the string */
 
                                 break;
@@ -233 +239 @@
 
                                 if (k == format->used - 1) {
-                                        log_error_write(srv, __FILE__, __LINE__, "ss", "config: ", "failed");
+                                        log_error_write(srv, __FILE__, __LINE__, "s", "%{ has to be terminated by a }");
                                         return -1;
                                 }
+
+                                /* after the } has to be a character */
                                 if (format->ptr[k+1] == '\0') {
-                                        log_error_write(srv, __FILE__, __LINE__, "ss", "config: ", "failed");
+                                        log_error_write(srv, __FILE__, __LINE__, "s", "%{...} has to be followed by a format-specifier");
+                                        return -1;
+                                }
+
+                                if (k == i + 2) {
+                                        log_error_write(srv, __FILE__, __LINE__, "s", "%{...} has to be contain a string");
                                         return -1;
                                 }
@@ -259 +272 @@
 
                                 if (fmap[j].key == '\0') {
-                                        log_error_write(srv, __FILE__, __LINE__, "ss", "config: ", "failed");
+                                        log_error_write(srv, __FILE__, __LINE__, "s", "%{...} has to be followed by a valid format-specifier");
                                         return -1;
                                 }
 
                                 start = k + 2;
+                                i = start - 1; /* skip the string */
 
                                 break;
                         default:
+                                /* after the % has to be a character */
+                                if (format->ptr[i+1] == '\0') {
+                                        log_error_write(srv, __FILE__, __LINE__, "s", "% has to be followed by a format-specifier");
+                                        return -1;
+                                }
+
                                 for (j = 0; fmap[j].key != '\0'; j++) {
                                         if (fmap[j].key != format->ptr[i+1]) continue;
@@ -283 +303 @@
 
                                 if (fmap[j].key == '\0') {
-                                        log_error_write(srv, __FILE__, __LINE__, "ss", "config: ", "failed");
+                                        log_error_write(srv, __FILE__, __LINE__, "s", "% has to be followed by a valid format-specifier");
                                         return -1;
                                 }
 
                                 start = i + 2;
+                                i = start - 1; /* skip the string */
 
                                 break;
@@ -782 +803 @@
                                 buffer_append_string(b, get_http_method_name(con->request.http_method));
                                 break;
+                        case FORMAT_PERCENT:
+                                buffer_append_string(b, "%");
+                                break;
                         case FORMAT_SERVER_PORT:
                                 buffer_append_long(b, srv->srvconf.port);