mirror of
https://github.com/php/php-src.git
synced 2024-11-26 11:23:47 +08:00
Fixed bug #25570 (Possible crash in apache2handler when zend_bailout called
outside of zend_try {} block).
This commit is contained in:
parent
42758e6ebd
commit
2998eeaf0d
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user