Safer signal handler (no malloc() call)

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index f79aba28c9e98a37000220a332c0ba6c08c9efe6..c039bb85d239ed52b6336d2b765cd524a0dcf568 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1188,7 +1188,8 @@ static void zend_timeout_handler(int dummy) /* {{{ */
                /* Die on hard timeout */
                const char *error_filename = NULL;
                uint error_lineno = 0;
-               char *log_buffer = NULL;
+               char log_buffer[2048];
+               int output_len = 0;
 
                if (zend_is_compiling()) {
                        error_filename = ZSTR_VAL(zend_get_compiled_filename());
@@ -1206,8 +1207,10 @@ static void zend_timeout_handler(int dummy) /* {{{ */
                        error_filename = "Unknown";
                }
 
-               zend_spprintf(&log_buffer, 0, "\nFatal error: Maximum execution time of " ZEND_LONG_FMT "+" ZEND_LONG_FMT " seconds exceeded (terminated) in %s on line %d\n", EG(timeout_seconds), EG(hard_timeout), error_filename, error_lineno);
-               write(2, log_buffer, strlen(log_buffer));
+               output_len = snprintf(log_buffer, sizeof(log_buffer), "\nFatal error: Maximum execution time of " ZEND_LONG_FMT "+" ZEND_LONG_FMT " seconds exceeded (terminated) in %s on line %d\n", EG(timeout_seconds), EG(hard_timeout), error_filename, error_lineno);
+               if (output_len > 0) {
+                       write(2, log_buffer, MIN(output_len, sizeof(log_buffer)));
+               }
                _exit(1);
     }
 #endif