iliaa Thu Sep 18 20:44:59 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/sapi/apache2handler sapi_apache2.c
Log:
MFH: Fixed bug #25570 (Possible crash in apache2handler when zend_bailout
called outside of zend_try {} block).
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.398 php-src/NEWS:1.1247.2.399
--- php-src/NEWS:1.1247.2.398 Mon Sep 15 19:49:40 2003
+++ php-src/NEWS Thu Sep 18 20:44:57 2003
@@ -7,6 +7,8 @@
- Fixed crash bug when non-existing save/serializer handler was used. (Jani)
- Fixed memory leak in gethostbynamel() if an error occurs. (Sara)
- Fixed FastCGI being unable to bind to a specific IP. (Sascha)
+- Fixed bug #25570 (Possible crash in apache2handler when zend_bailout called
+ outside of zend_try {} block). (Ilia)
- Fixed bug #25530 (checkdate() incorrectly handles floats). (Ilia)
- Fixed bug #25525 (ldap_explode_dn() crashes when passed invalid dn).
(Sara, patch by: mikael dot suvi at trigger dot ee)
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.21
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.22
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.21 Wed Aug 6 18:34:20 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Sep 18 20:44:58 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.21 2003/08/06 22:34:20 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.22 2003/09/19 00:44:58 iliaa Exp $ */
#include <fcntl.h>
@@ -492,6 +492,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));
@@ -560,6 +562,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
