Index: /trunk/Decompiler.class.php
===================================================================
--- /trunk/Decompiler.class.php	(revision 727)
+++ /trunk/Decompiler.class.php	(revision 730)
@@ -1670,8 +1670,9 @@
 		// }}}
 		// {{{ properties
-		if (!empty($class['default_properties']) || !empty($class['default_static_members'])) {
+		$member_variables = isset($class['properties_info']) ? $class['properties_info'] : ($class['default_static_members'] + $class['default_properties']);
+		if ($member_variables) {
 			echo "\n";
 			$infos = !empty($class['properties_info']) ? $class['properties_info'] : null;
-			foreach (!empty($class['properties_info']) ? $class['properties_info'] : ($class['default_static_members'] + $class['default_properties']) as $name => $dummy) {
+			foreach ($member_variables as $name => $dummy) {
 				$info = (isset($infos) && isset($infos[$name])) ? $infos[$name] : null;
 				if (isset($info)) {
@@ -1726,7 +1727,12 @@
 				echo '$', $name;
 
-				$key = isset($info) ? $info['name'] . ($mangled ? "\000" : "") : $name;
-
-				$value = $class[$static ? 'default_static_members' : 'default_properties'][$key];
+				if (isset($info['offset'])) {
+					$value = $class[$static ? 'default_static_members_table' : 'default_properties_table'][$info['offset']];
+				}
+				else {
+					$key = isset($info) ? $info['name'] . ($mangled ? "\000" : "") : $name;
+
+					$value = $class[$static ? 'default_static_members' : 'default_properties'][$key];
+				}
 				if (isset($value)) {
 					echo ' = ';
Index: /trunk/processor/processor.m4
===================================================================
--- /trunk/processor/processor.m4	(revision 724)
+++ /trunk/processor/processor.m4	(revision 730)
@@ -328,8 +328,8 @@
 #ifdef ZEND_ENGINE_2_4
 	DISPATCH(int, default_properties_count)
-	STRUCT_ARRAY(default_properties_count, zval, default_properties_table)
+	STRUCT_ARRAY(default_properties_count, zval_ptr, default_properties_table)
 	DISPATCH(int, default_static_members_count)
-	STRUCT_ARRAY(default_static_members_count, zval, default_static_members_table)
-	IFCOPY(`dst->static_members_table = &dst->default_static_members_table;')
+	STRUCT_ARRAY(default_static_members_count, zval_ptr, default_static_members_table)
+	IFCOPY(`dst->static_members_table = dst->default_static_members_table;')
 	DONE(static_members_table)
 #else