| Dmitry Stogov 2005-08-17, 9:01 am |
| dmitry Wed Aug 17 07:57:10 2005 EDT
Modified files:
/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...&r2=1.2041&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2040 php-src/NEWS:1.2041
--- php-src/NEWS:1.2040 Tue Aug 16 10:10:13 2005
+++ php-src/NEWS Wed Aug 17 07:57:09 2005
@@ -2,6 +2,8 @@
||||||||||||||||||||||||||||||||||||||||
|||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 6.0
- Fixed bug #34148 (+,- and . not supported as parts of scheme). (Ilia)
+- Fixed bug #32981 (ReflectionMethod::getStaticVariables() causes apache2.0.54
+ seg fault). (Dmitry)
- cURL improvements (Ilia)
. Added curl_setopt_array() which allows setting of multiple cURL options.
. Added CURLINFO_HEADER_OUT to facilitate request retrieval.
http://cvs.php.net/diff.php/ZendEng...8&r2=1.169&ty=u
Index: ZendEngine2/zend_reflection_api.c
diff -u ZendEngine2/zend_reflection_api.c:1.168 ZendEngine2/zend_reflection_api.c:1.169
--- ZendEngine2/zend_reflection_api.c:1.168 Fri Aug 12 10:08:19 2005
+++ ZendEngine2/zend_reflection_api.c Wed Aug 17 07:57:10 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_reflection_api.c,v 1.168 2005/08/12 14:08:19 sebastian Exp $ */
+/* $Id: zend_reflection_api.c,v 1.169 2005/08/17 11:57:10 dmitry Exp $ */
#include "zend.h"
#include "zend_API.h"
#include "zend_exceptions.h"
@@ -1399,6 +1399,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/ZendEng...1.2&r2=1.3&ty=u
Index: ZendEngine2/tests/bug32981.phpt
diff -u ZendEngine2/tests/bug32981.phpt:1.2 ZendEngine2/tests/bug32981.phpt:1.3
--- ZendEngine2/tests/bug32981.phpt:1.2 Mon Aug 15 10:37:54 2005
+++ ZendEngine2/tests/bug32981.phpt Wed Aug 17 07:57:10 2005
@@ -28,7 +28,7 @@
[0]=>
array(1) {
["enabled"]=>
- UNKNOWN:0 /* FIXME */
+ bool(true)
}
}
===DONE===
@@ -38,7 +38,7 @@
[0]=>
array(1) {
[u"enabled"]=>
- UNKNOWN:0 /* FIXME */
+ bool(true)
}
}
===DONE===
|