Changeset 2071

Timestamp:

02/01/2008 03:27:51 PM (7 months ago)

Author:

jan

Message:

fixed log_write() for log-files > 4kbyte

the buffer_prepare_append() works against a "used" buffer, but ->used
get's never updated. With older glibc's which leads to a infinite loop

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• src/log.c (modified) (2 diffs)

trunk/NEWS

@@ -17 +17 @@
   * mod_auth ldap rework, most important change is being able to startup if ldap server is down (#1535)
   * fixed ECONNRESET handling in network-openssl
+  * fixed log_write() for log-files > 4kbyte
 
 - 1.5.0-r19.. -

trunk/src/log.c

@@ -322 +322 @@
                 va_end(ap);
 
+                /* if 'l' is between -1 and size we are good,
+                 * otherwise we have to resize to size 
+                 */
+
                 if (l > -1 && ((unsigned int) l) < b->size) {
                         b->used = l + 1;
@@ -329 +333 @@
 
                 if (l > -1) {
-                        /* l is the mem-size we need */
+                        /* C99: l is the mem-size we need */
                         buffer_prepare_copy(b, l);
                 } else {
-                        /* try to get some more bytes and try again */
-                        buffer_prepare_append(b, 512);
+                        /* glibc 2.0.x and earlier return -1 */
+                        buffer_prepare_copy(b, b->size + 512);
                 }
         } while(1);