From: Antony Dovgal <tony2001@php.net>
Date: Wed, 11 Jul 2007 22:06:54 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.2.4RC1~176
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3ac98438591d27ad83828b73fa7cd295660a7b7;p=php

MFH
---

diff --git a/NEWS b/NEWS
index 21d7de0a33..e3d6a5c82d 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@ PHP                                                                        NEWS
 - Upgraded PCRE to version 7.2 (Nuno)
 - Updated timezone database to version 2007.6. (Derick)
 
-- Improced openssl_x509_parse() to return extensions in readable form. (Dmitry)
+- Improved openssl_x509_parse() to return extensions in readable form. (Dmitry)
 - Improved fix for MOPB-03-2007. (Ilia)
 - Corrected fix for CVE-2007-2872. (Ilia)
 - Enabled statement cache for non-persistent OCI8 connections.
@@ -32,7 +32,10 @@ PHP                                                                        NEWS
 - Added CURLOPT_PRIVATE & CURLINFO_PRIVATE constants. 
   (Andrey A. Belashkov, Tony)
 
-- Fixed crash in OpenSSL extension because of non-strin passphrase. (Dmitry)
+- Implemented FR #41884 (ReflectionClass::getDefaultProperties() does not handle 
+  static attributes). (Tony)
+
+- Fixed crash in OpenSSL extension because of non-string passphrase. (Dmitry)
 - Fixed var_export() to use the new H modifier so that it can generate
   parseable PHP code for floats, independent of the locale. (Derick)
 - Fixed regression introduced by the fix for the libgd bug #74. (Pierre)
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 02f8db1144..499a43d52d 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -2804,7 +2804,8 @@ ZEND_METHOD(reflection_class, getDefaultProperties)
 {
 	reflection_object *intern;
 	zend_class_entry *ce;
-	int count;
+	int count, i;
+	HashTable *ht_list[3];
 	
 	METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0);	
 	GET_REFLECTION_OBJECT_PTR(ce);
@@ -2812,33 +2813,40 @@ ZEND_METHOD(reflection_class, getDefaultProperties)
 
 	zend_update_class_constants(ce TSRMLS_CC);
 
-	count = zend_hash_num_elements(&ce->default_properties);
-	if (count > 0) {
-		HashPosition pos;
-		zval **prop;
+	ht_list[0] = CE_STATIC_MEMBERS(ce);
+	ht_list[1] = &ce->default_properties;
+	ht_list[2] = NULL;
 
-		zend_hash_internal_pointer_reset_ex(&ce->default_properties, &pos);
-		while (zend_hash_get_current_data_ex(&ce->default_properties, (void **) &prop, &pos) == SUCCESS) {
-			char *key, *class_name, *prop_name;
-			uint key_len;
-			ulong num_index;
-			zval *prop_copy;
+	for (i = 0; ht_list[i] != NULL; i++) {
 
-			zend_hash_get_current_key_ex(&ce->default_properties, &key, &key_len, &num_index, 0, &pos);
-			zend_hash_move_forward_ex(&ce->default_properties, &pos);
-			zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name);
-			if (class_name && class_name[0] != '*' && strcmp(class_name, ce->name)) {
-				/* filter privates from base classes */
-				continue;
-			}
+		count = zend_hash_num_elements(ht_list[i]);
+		if (count > 0) {
+			HashPosition pos;
+			zval **prop;
+
+			zend_hash_internal_pointer_reset_ex(ht_list[i], &pos);
+			while (zend_hash_get_current_data_ex(ht_list[i], (void **) &prop, &pos) == SUCCESS) {
+				char *key, *class_name, *prop_name;
+				uint key_len;
+				ulong num_index;
+				zval *prop_copy;
+
+				zend_hash_get_current_key_ex(ht_list[i], &key, &key_len, &num_index, 0, &pos);
+				zend_hash_move_forward_ex(ht_list[i], &pos);
+				zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name);
+				if (class_name && class_name[0] != '*' && strcmp(class_name, ce->name)) {
+					/* filter privates from base classes */
+					continue;
+				}
 
-			/* copy: enforce read only access */
-			ALLOC_ZVAL(prop_copy);
-			*prop_copy = **prop;
-			zval_copy_ctor(prop_copy);
-			INIT_PZVAL(prop_copy);
+				/* copy: enforce read only access */
+				ALLOC_ZVAL(prop_copy);
+				*prop_copy = **prop;
+				zval_copy_ctor(prop_copy);
+				INIT_PZVAL(prop_copy);
 
-			add_assoc_zval(return_value, prop_name, prop_copy);
+				add_assoc_zval(return_value, prop_name, prop_copy);
+			}
 		}
 	}
 }
diff --git a/ext/reflection/tests/bug41884.phpt b/ext/reflection/tests/bug41884.phpt
new file mode 100644
index 0000000000..f8c0a0a2bc
--- /dev/null
+++ b/ext/reflection/tests/bug41884.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #41884 (ReflectionClass::getDefaultProperties() does not handle static attributes)
+--FILE--
+<?php
+
+class Foo
+{
+	protected static $fooStatic = 'foo';
+	protected $foo = 'foo';
+}
+
+$class = new ReflectionClass('Foo');
+
+var_dump($class->getDefaultProperties());
+
+echo "Done\n";
+?>
+--EXPECTF--	
+array(2) {
+  ["fooStatic"]=>
+  string(3) "foo"
+  ["foo"]=>
+  string(3) "foo"
+}
+Done