cvs: php4 /main main.c

zeev Wed Aug 30 11:02:00 2000 EDT Modified files: /php4/main main.c Log: - Truly fix varargs handling - the current situation was a sure-fire crash in most platforms (the older code worked, even though it didn't compile well for some very odd reason, probably a compiler bug; The new code would cause PHP to crash if both display_errors/log_errors and track_errors were enabled) Index: php4/main/main.c diff -u php4/main/main.c:1.304 php4/main/main.c:1.305 --- php4/main/main.c:1.304 Tue Aug 29 02:18:48 2000 +++ php4/main/main.c Wed Aug 30 11:02:00 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.304 2000/08/29 09:18:48 ssb Exp $ */ +/* $Id: main.c,v 1.305 2000/08/30 18:02:00 zeev Exp $ */ #include <stdio.h> @@ -366,7 +366,6 @@ /* get include file name */ if (PG(log_errors) || PG(display_errors) || (!module_initialized)) { size = vsnprintf(buffer, sizeof(buffer) - 1, format, orig_args); - va_end(orig_args); buffer[sizeof(buffer) - 1] = 0; @@ -442,7 +441,6 @@ pval *tmp; size = vsnprintf(buffer, sizeof(buffer) - 1, format, orig_args); - va_end(orig_args); buffer[sizeof(buffer) - 1] = 0;