[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

[Ilia Alshanetsky]

iliaa           Thu Sep 18 20:44:50 2003 EDT

  Modified files:              
    /php-src/sapi/apache2handler        sapi_apache2.c 
  Log:
  Fixed bug #25570 (Possible crash in apache2handler when zend_bailout called 
  outside of zend_try {} block).
  
  
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.26 
php-src/sapi/apache2handler/sapi_apache2.c:1.27
--- php-src/sapi/apache2handler/sapi_apache2.c:1.26     Wed Aug  6 18:33:18 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c  Thu Sep 18 20:44:50 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.26 2003/08/06 22:33:18 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.27 2003/09/19 00:44:50 iliaa Exp $ */
 
 #include <fcntl.h>
 
@@ -487,6 +487,8 @@
                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));
@@ -555,6 +557,8 @@
        } else {
                ctx->r = parent_req;
        }
+
+} zend_end_try();
 
        return OK;
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php