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

outside of zend_try {} block).

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 4982a740d4b66c2f848d36e881881be69639fe00..ae9727700d66897c69d0307e936f49950245b3ad 100644 (file)
--- 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;
 }