fixes #295: crash using traits with PHP 5.4.8+

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1196 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

ChangeLog

@@ -1,8 +1,9 @@
 3.0.1 2012-??-??
 ChangeLog
 ========
- * fixs crash when cache is too small on start up
- * fixs #290: workaround phpize vs fbsd make bug again
+ * fixes crash when cache is too small on start up
+ * fixes #295: crash using traits with PHP 5.4.8+
+ * fixes #290: workaround phpize vs fbsd make bug again
  * improve compatibility with "the ionCube PHP Loader", Zend Optimizer
  * fix random crash when cache is reinitialized yet failed (Thanks to Brad Baker for generating crash dump)
 

processor/processor.m4

@@ -719,6 +719,11 @@ DEF_STRUCT_P_FUNC(`zend_op_array', , `dnl {{{
 		/* really fast shallow copy */
 		memcpy(dst, src, sizeof(src[0]));
 		dst->refcount[0] = 1000;
+#ifdef ZEND_ACC_ALIAS
+		if ((processor->active_class_entry_src && (processor->active_class_entry_src->ce_flags & ZEND_ACC_TRAIT))) {
+			PROC_ZSTRING(, function_name)
+		}
+#endif
 		/* deep */
 		STRUCT_P(HashTable, static_variables, HashTable_zval_ptr)
 #ifdef ZEND_ENGINE_2

xcache_globals.h

@@ -28,6 +28,9 @@ ZEND_BEGIN_MODULE_GLOBALS(xcache)
 	zval var_namespace_soft;
 
 	zend_llist gc_op_arrays;
+#ifdef ZEND_ACC_ALIAS
+	zend_llist gc_class_entries;
+#endif
 
 #ifdef HAVE_XCACHE_CONSTANT
 	HashTable internal_constant_table;