dmitry Wed Aug 17 07:54:12 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/ZendEngine2 zend_reflection_api.c
/ZendEngine2/tests bug32981.phpt
Log:
Fixed bug #32981 (ReflectionMethod::getStaticVariables() causes apache2.0.54
seg fault)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.463&r2=1.1760.2.464&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.463 php-src/NEWS:1.1760.2.464
--- php-src/NEWS:1.1760.2.463 Thu Aug 11 17:21:56 2005
+++ php-src/NEWS Wed Aug 17 07:53:59 2005
@@ -76,6 +76,8 @@
- Fixed bug #33017 ("make distclean" gives an error with VPATH build). (Jani)
- Fixed bug #33013 ("next month" was handled wrong while parsing dates).
(Derick)
+- Fixed bug #32981 (ReflectionMethod::getStaticVariables() causes apache2.0.54
+ seg fault). (Dmitry)
- Fixed bug #32956 (mysql_bind_result() doesn't support MYSQL_TYPE_NULL).
(Georg)
- Fixed bug #32947 (Incorrect option for mysqli default password). (Georg)
- Fixed bug #32944 (Disabling session.use_cookies doesn't prevent reading
http://cvs.php.net/diff.php/ZendEngine2/zend_reflection_api.c?r1=1.111.2.23&r2=1.111.2.24&ty=u
Index: ZendEngine2/zend_reflection_api.c
diff -u ZendEngine2/zend_reflection_api.c:1.111.2.23
ZendEngine2/zend_reflection_api.c:1.111.2.24
--- ZendEngine2/zend_reflection_api.c:1.111.2.23 Thu Aug 11 17:17:28 2005
+++ ZendEngine2/zend_reflection_api.c Wed Aug 17 07:54:10 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_reflection_api.c,v 1.111.2.23 2005/08/11 21:17:28 tony2001 Exp $
*/
+/* $Id: zend_reflection_api.c,v 1.111.2.24 2005/08/17 11:54:10 dmitry Exp $ */
#include "zend.h"
#include "zend_API.h"
#include "zend_exceptions.h"
@@ -1335,6 +1335,7 @@
/* Return an empty array in case no static variables exist */
array_init(return_value);
if (fptr->type == ZEND_USER_FUNCTION && fptr->op_array.static_variables
!= NULL) {
+ zend_hash_apply_with_argument(fptr->op_array.static_variables,
(apply_func_arg_t) zval_update_constant, (void*)1 TSRMLS_CC);
zend_hash_copy(Z_ARRVAL_P(return_value),
fptr->op_array.static_variables, (copy_ctor_func_t) zval_add_ref, (void *)
&tmp_copy, sizeof(zval *));
}
}
http://cvs.php.net/diff.php/ZendEngine2/tests/bug32981.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u
Index: ZendEngine2/tests/bug32981.phpt
diff -u ZendEngine2/tests/bug32981.phpt:1.1.2.2
ZendEngine2/tests/bug32981.phpt:1.1.2.3
--- ZendEngine2/tests/bug32981.phpt:1.1.2.2 Thu May 26 08:24:57 2005
+++ ZendEngine2/tests/bug32981.phpt Wed Aug 17 07:54:11 2005
@@ -28,7 +28,7 @@
[0]=>
array(1) {
["enabled"]=>
- UNKNOWN:0
+ bool(true)
}
}
===DONE===
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
