From 2998eeaf0d148cb7b583e636d892a7f721dc366c Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Fri, 19 Sep 2003 00:44:50 +0000 Subject: [PATCH] Fixed bug #25570 (Possible crash in apache2handler when zend_bailout called outside of zend_try {} block). --- sapi/apache2handler/sapi_apache2.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 4982a740d4..ae9727700d 100644 --- 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; } -- 2.50.1