From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 19 Sep 2003 00:44:50 +0000 (+0000)
Subject: Fixed bug #25570 (Possible crash in apache2handler when zend_bailout called
X-Git-Tag: RELEASE_0_7~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2998eeaf0d148cb7b583e636d892a7f721dc366c;p=php

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