svn: /php/php-src/branches/PHP_5_2/Zend/ zend_API.c
| From: | Pierre-Alain Joye | Date: | Sat, 05 Sep 2009 19:01:06 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_2/Zend/ zend_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60334@lists.php.net to get a copy of this message | ||
pajoye Sat, 05 Sep 2009 19:01:06 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288089
Log:
- WS
Changed paths:
U php/php-src/branches/PHP_5_2/Zend/zend_API.c
Modified: php/php-src/branches/PHP_5_2/Zend/zend_API.c
===================================================================
--- php/php-src/branches/PHP_5_2/Zend/zend_API.c 2009-09-05 19:00:05 UTC (rev 288088)
+++ php/php-src/branches/PHP_5_2/Zend/zend_API.c 2009-09-05 19:01:06 UTC (rev 288089)
@@ -901,10 +901,10 @@
zend_hash_get_current_key_ex(&class_type->default_static_members, &str_index,
&str_length, &num_index, 0, &pos);
if ((*p)->is_ref &&
- class_type->parent &&
- zend_hash_find(&class_type->parent->default_static_members, str_index,
str_length, (void**)&q) == SUCCESS &&
- *p == *q &&
- zend_hash_find(CE_STATIC_MEMBERS(class_type->parent), str_index, str_length,
(void**)&q) == SUCCESS) {
+ class_type->parent &&
+ zend_hash_find(&class_type->parent->default_static_members, str_index, str_length,
(void**)&q) == SUCCESS &&
+ *p == *q &&
+ zend_hash_find(CE_STATIC_MEMBERS(class_type->parent), str_index, str_length,
(void**)&q) == SUCCESS) {
(*q)->refcount++;
(*q)->is_ref = 1;
zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q, sizeof(zval*),
NULL);