From 80538812119d4f940fce2bc408761a28c8b3add5 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Sat, 17 May 2003 08:06:53 +0000 Subject: [PATCH] protect against further surprises by initializing all zend_file_handle's --- sapi/aolserver/aolserver.c | 2 +- sapi/apache/mod_php4.c | 2 +- sapi/apache/sapi_apache.c | 2 +- sapi/apache2filter/sapi_apache2.c | 2 +- sapi/apache2handler/sapi_apache2.c | 2 +- sapi/caudium/caudium.c | 2 +- sapi/cgi/cgi_main.c | 2 +- sapi/cli/php_cli.c | 2 +- sapi/isapi/php4isapi.c | 2 +- sapi/nsapi/nsapi.c | 2 +- sapi/phttpd/phttpd.c | 2 +- sapi/pi3web/pi3web_sapi.c | 2 +- sapi/roxen/roxen.c | 2 +- sapi/servlet/servlet.c | 2 +- sapi/thttpd/thttpd.c | 2 +- sapi/tux/php_tux.c | 2 +- sapi/webjames/webjames.c | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index 665dd4190c..ea2f2ab593 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -404,7 +404,7 @@ static sapi_module_struct aolserver_sapi_module = { static int php_ns_module_main(TSRMLS_D) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated; diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index d5f59b21d2..a0cbee47fd 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -534,7 +534,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename) TSRMLS_FETCH(); if (AP(in_request)) { - zend_file_handle fh; + zend_file_handle fh = {0}; fh.filename = r->filename; fh.opened_path = NULL; diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index 8b651de012..3075f25d8f 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -28,7 +28,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode TSRMLS_DC) { int retval = OK; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; if (php_request_startup(TSRMLS_C) == FAILURE) { return FAILURE; diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index 0d7eabb0da..a84052a092 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -445,7 +445,7 @@ static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) } for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BUCKET_NEXT(b)) { - zend_file_handle zfd; + zend_file_handle zfd = {0}; if (!ctx->request_processed && APR_BUCKET_IS_FILE(b)) { const char *path; diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index eef5669b1d..b6492db8d5 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -507,7 +507,7 @@ static int php_handler(request_rec *r) php_get_highlight_struct(&syntax_highlighter_ini); highlight_file((char *)r->filename, &syntax_highlighter_ini TSRMLS_CC); } else { - zend_file_handle zfd; + zend_file_handle zfd = {0}; zfd.type = ZEND_HANDLE_FILENAME; zfd.filename = (char *) r->filename; diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c index 6b61060c88..1914430638 100644 --- a/sapi/caudium/caudium.c +++ b/sapi/caudium/caudium.c @@ -564,7 +564,7 @@ static sapi_module_struct caudium_sapi_module = { static void php_caudium_module_main(php_caudium_request *ureq) { int res; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; #ifndef USE_PIKE_LEVEL_THREADS struct thread_state *state; extern struct program *thread_id_prog; diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index bf7a33b923..34140b9516 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -894,7 +894,7 @@ int main(int argc, char *argv[]) { int exit_status = SUCCESS; int cgi = 0, c, i, len; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; int retval = FAILURE; char *s; /* temporary locals */ diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 8937cc6edd..93515b549b 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -438,7 +438,7 @@ int main(int argc, char *argv[]) { int exit_status = SUCCESS; int c; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; /* temporary locals */ int behavior=PHP_MODE_STANDARD; int no_headers=1; diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c index fc8f5d9667..88d95ebdaf 100644 --- a/sapi/isapi/php4isapi.c +++ b/sapi/isapi/php4isapi.c @@ -717,7 +717,7 @@ BOOL exceptionhandler(LPEXCEPTION_POINTERS *e, LPEXCEPTION_POINTERS ep) DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; zend_bool stack_overflown=0; #ifdef PHP_ENABLE_SEH LPEXCEPTION_POINTERS e; diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c index a9ed176d6d..d3d1bb1d8d 100644 --- a/sapi/nsapi/nsapi.c +++ b/sapi/nsapi/nsapi.c @@ -493,7 +493,7 @@ static void nsapi_request_dtor(NSLS_D TSRMLS_DC) int nsapi_module_main(NSLS_D TSRMLS_DC) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; if (php_request_startup(TSRMLS_C) == FAILURE) { return FAILURE; diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c index 1928b6060e..0e662856bd 100644 --- a/sapi/phttpd/phttpd.c +++ b/sapi/phttpd/phttpd.c @@ -247,7 +247,7 @@ php_phttpd_request_dtor(TSRMLS_D TSRMLS_DC) int php_doit(TSRMLS_D TSRMLS_DC) { struct stat sb; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; struct httpinfo *hip = PHG(cip)->hip; TSRMLS_FETCH(); diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c index 43f784d534..09bb892777 100644 --- a/sapi/pi3web/pi3web_sapi.c +++ b/sapi/pi3web/pi3web_sapi.c @@ -387,7 +387,7 @@ static sapi_module_struct pi3web_sapi_module = { DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; int iRet = PIAPI_COMPLETED; TSRMLS_FETCH(); diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c index 855e1e90b3..d0e5501cce 100644 --- a/sapi/roxen/roxen.c +++ b/sapi/roxen/roxen.c @@ -575,7 +575,7 @@ static int php_roxen_module_main(TSRMLS_D) { int res, len; char *dir; - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; #ifdef ROXEN_USE_ZTS GET_THIS(); #endif diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index c4fceba252..b3bcd3fe20 100644 --- a/sapi/servlet/servlet.c +++ b/sapi/servlet/servlet.c @@ -310,7 +310,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send jstring contentType, jint contentLength, jstring authUser, jboolean display_source_mode) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; int retval; #ifndef VIRTUAL_DIR char cwd[MAXPATHLEN]; diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c index 48054c4394..344962921a 100644 --- a/sapi/thttpd/thttpd.c +++ b/sapi/thttpd/thttpd.c @@ -388,7 +388,7 @@ static sapi_module_struct thttpd_sapi_module = { static void thttpd_module_main(int show_source TSRMLS_DC) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; if (php_request_startup(TSRMLS_C) == FAILURE) { return; diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c index 7db243773c..093e3326cf 100644 --- a/sapi/tux/php_tux.c +++ b/sapi/tux/php_tux.c @@ -296,7 +296,7 @@ static sapi_module_struct tux_sapi_module = { static void tux_module_main(TSRMLS_D) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated; diff --git a/sapi/webjames/webjames.c b/sapi/webjames/webjames.c index 75a55b79c5..06e9adb59b 100644 --- a/sapi/webjames/webjames.c +++ b/sapi/webjames/webjames.c @@ -142,7 +142,7 @@ static void sapi_webjames_register_variables(zval *track_vars_array TSRMLS_DC) static void webjames_module_main(TSRMLS_D) { - zend_file_handle file_handle; + zend_file_handle file_handle = {0}; FILE *fp=NULL; char *path; -- 2.40.0