archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
outside of zend_try {} block).
This commit is contained in:
Ilia Alshanetsky 2003-09-19 00:44:50 +00:00
parent 42758e6ebd
commit 2998eeaf0d
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sapi/apache2handler/sapi_apache2.c
View file

@ -487,6 +487,8 @@ static int php_handler(request_rec *r)
ap_add_cgi_vars(r); ap_add_cgi_vars(r);
} }
zend_first_try {
ctx = SG(server_context); ctx = SG(server_context);
if (ctx == NULL) { if (ctx == NULL) {
ctx = SG(server_context) = apr_pcalloc(r->pool, sizeof(*ctx)); 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; ctx->r = parent_req;
} }
} zend_end_try();
return OK; return OK;
} }