mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Hopefully last round of fixing varargs use.

Browse Source 
We don't need to create the log message twice, and by doing it only
once we also avoid the orig_args trap.
This commit is contained in:
Sascha Schumann 2000-09-01 09:54:32 +00:00
parent d60799bf6b
commit df273c9d01
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main/main.c
View File

@ -329,6 +329,7 @@ PHPAPI int php_printf(const char *format, ...)
static void php_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list orig_args)
{
char buffer[1024];
zend_bool buffer_ok = 0;
int size = 0;
ELS_FETCH();
PLS_FETCH();
@ -366,6 +367,8 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
/* get include file name */
if (PG(log_errors) || PG(display_errors) || (!module_initialized)) {
size = vsnprintf(buffer, sizeof(buffer) - 1, format, orig_args);
buffer_ok = 1;
va_end(orig_args);
buffer[sizeof(buffer) - 1] = 0;
@ -440,9 +443,11 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
if (PG(track_errors) && EG(active_symbol_table)) {
pval *tmp;
size = vsnprintf(buffer, sizeof(buffer) - 1, format, orig_args);
buffer[sizeof(buffer) - 1] = 0;
if (!buffer_ok) {
size = vsnprintf(buffer, sizeof(buffer) - 1, format, orig_args);
buffer[sizeof(buffer) - 1] = 0;
va_end(orig_args);
}
ALLOC_ZVAL(tmp);
INIT_PZVAL(tmp);