diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-09-19 00:44:50 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-09-19 00:44:50 +0000 |
| commit | 2998eeaf0d148cb7b583e636d892a7f721dc366c (patch) | |
| tree | 2d9f3c69c173ab64f60ce5c3798f36e69d60598e /sapi/apache2handler/sapi_apache2.c | |
| parent | 42758e6ebdb490926d704271728e7720a66f31d7 (diff) | |
| download | php-git-2998eeaf0d148cb7b583e636d892a7f721dc366c.tar.gz | |
Fixed bug #25570 (Possible crash in apache2handler when zend_bailout called
outside of zend_try {} block).
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; } |