Changeset 2073

Timestamp:

02/11/2008 09:15:39 PM (5 months ago)

Author:

jan

Message:

limit the number of resizes for large log-messages (from stbuehler)

Files:

• trunk/src/log.c (modified) (3 diffs)

trunk/src/log.c

@@ -310 +310 @@
-int log_trace(const char *fmt, ...) {
-        buffer *b;
-
+, tries = 0
-        errorlog *err = myconfig;
-        va_list ap;
@@ -318 +318 @@
-
-        do {
+                errno = 0;
-                va_start(ap, fmt);
-                l = vsnprintf(b->ptr, b->size, fmt, ap);
@@ -335 +336 @@
-                        /* C99: l is the mem-size we need */
-                        buffer_prepare_copy(b, l);
+                } else if (tries++ >= 3) {
+                        int e = errno;
+                        /* glibc 2.0.6 and earlier return -1 if the output was truncated
+                         * so we try to increase the buffer size 3 times - so you cannot
+                         * print error messages longer than 8 * 4096 = 32k with glib <= 2.0.6
+                         */
+                        buffer_copy_string_len(b, CONST_STR_LEN("log_trace: vsnprintf error: l = "));
+                        buffer_append_long(b, l);
+                        if (e) {
+                                buffer_append_string_len(b, CONST_STR_LEN(", errno = "));
+                                buffer_append_long(b, errno);
+                                buffer_append_string_len(b, CONST_STR_LEN(": "));
+                                buffer_append_string(b, strerror(e));
+                        }
+                        break;
-                } else {
-
-
+
-                }
-        } while(1);