- Fixed bug #53748 (Using traits lead to a segmentation fault)

Zend/tests/bug53748.phpt

@@ -0,0 +1,39 @@
+--TEST--
+Bug #53748 (Using traits lead to a segmentation fault)
+--FILE--
+<?php
+
+trait Singleton {
+  protected static $instances=array();
+  abstract protected function __construct($config);
+  public static function getInstance($config) {
+    if (!isset(self::$instances[$serialize = serialize($config)])) {
+      self::$instances[$serialize] = new self($config);
+    }
+    return self::$instances[$serialize];
+  }
+}
+
+class MyHelloWorld {
+  use Singleton;
+  public function __construct($config)
+  {
+    var_dump( $config);
+  }
+}
+
+
+$o= myHelloWorld::getInstance(1);
+$o= myHelloWorld::getInstance(1);
+$o= myHelloWorld::getInstance(2);
+$o= myHelloWorld::getInstance(array(1=>2));
+$o= myHelloWorld::getInstance(array(1=>2));
+
+?>
+--EXPECTF--
+int(1)
+int(2)
+array(1) {
+  [1]=>
+  int(2)
+}

Zend/zend_compile.c

@@ -3963,6 +3963,7 @@ static void zend_do_traits_property_binding(zend_class_entry *ce TSRMLS_DC) /* {
 			} else {
 				prop_value = ce->traits[i]->default_properties_table[property_info->offset];
 			}
+			Z_ADDREF_P(prop_value);
 
 			zend_declare_property_ex(ce, prop_name, prop_name_length, 
 									 prop_value, property_info->flags,