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

outside of zend_try {} block).
This commit is contained in:
Ilia Alshanetsky 2003-09-19 00:44:50 +00:00
parent 42758e6ebd
commit 2998eeaf0d

View File

@ -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;
}