always increment ref count of memoized types

Bulat Shakirzyanov · Bulat Shakirzyanov · commit a5fff206221f · 2015-09-03T13:13:34.000-07:00
diff --git a/ext/util/types.c b/ext/util/types.c
@@ -137,6 +137,7 @@ php_cassandra_type_scalar(CassValueType type TSRMLS_DC)
     if (CASSANDRA_G(TYPE_CODE(name)) == NULL) { \
       CASSANDRA_G(TYPE_CODE(name)) = php_cassandra_type_scalar_new(type TSRMLS_CC); \
     } \
+    Z_ADDREF_P(CASSANDRA_G(TYPE_CODE(name))); \
     return CASSANDRA_G(TYPE_CODE(name)); \
   }
   PHP_CASSANDRA_SCALAR_TYPES_MAP(XX_SCALAR)
@@ -595,7 +596,6 @@ php_cassandra_create_type(struct node_s* node, zval** type_out TSRMLS_DC)
     *type_out = php_cassandra_type_set(php_cassandra_lookup_type(node->first_child TSRMLS_CC) TSRMLS_CC);
   } else {
     *type_out = php_cassandra_type_scalar(type TSRMLS_CC);
-    Z_ADDREF_P(*type_out);
   }
 
   return SUCCESS;

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,7 @@ php_cassandra_type_scalar(CassValueType type TSRMLS_DC)`
`137`	`137`	`if (CASSANDRA_G(TYPE_CODE(name)) == NULL) { \`
`138`	`138`	`CASSANDRA_G(TYPE_CODE(name)) = php_cassandra_type_scalar_new(type TSRMLS_CC); \`
`139`	`139`	`} \`
	`140`	`+ Z_ADDREF_P(CASSANDRA_G(TYPE_CODE(name))); \`
`140`	`141`	`return CASSANDRA_G(TYPE_CODE(name)); \`
`141`	`142`	`}`
`142`	`143`	`PHP_CASSANDRA_SCALAR_TYPES_MAP(XX_SCALAR)`
`@@ -595,7 +596,6 @@ php_cassandra_create_type(struct node_s* node, zval** type_out TSRMLS_DC)`
`595`	`596`	`*type_out = php_cassandra_type_set(php_cassandra_lookup_type(node->first_child TSRMLS_CC) TSRMLS_CC);`
`596`	`597`	`} else {`
`597`	`598`	`*type_out = php_cassandra_type_scalar(type TSRMLS_CC);`
`598`		`- Z_ADDREF_P(*type_out);`
`599`	`599`	`}`
`600`	`600`
`601`	`601`	`return SUCCESS;`