Fixed bug #25570 (Possible crash in apache2handler when zend_bailout called

outside of zend_try {} block).
23 years ago · 2998eeaf0d
1 changed files with 4 additions and 0 deletions
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@ -487,6 +487,8 @@ static int php_handler(request_rec *r)
 		ap_add_cgi_vars(r);
 	}

+zend_first_try {
+
 	ctx = SG(server_context);
 	if (ctx == NULL) {
 		ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx));
@ -556,6 +558,8 @@ static int php_handler(request_rec *r)
 		ctx->r = parent_req;
 	}

+} zend_end_try();
+
 	return OK;
 }