X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Fphp_pqstm.c;h=d360d0dc97450dc0f823bb55014d2aa12f3cfc5a;hb=503262d1da0dfeb5b947d95f5b8eb18c8ba41ac9;hp=f6da0672f40ceac17de684aef0b8cb51abd03599;hpb=17e598e884de8653f13fe6450e348ed7d30ea8f5;p=m6w6%2Fext-pq

diff --git a/src/php_pqstm.c b/src/php_pqstm.c
index f6da067..d360d0d 100644
--- a/src/php_pqstm.c
+++ b/src/php_pqstm.c
@@ -79,6 +79,7 @@ static void php_pqstm_object_free(void *o TSRMLS_DC)
 			php_pq_object_delref(obj->intern->conn TSRMLS_CC);
 		}
 		efree(obj->intern->name);
+		efree(obj->intern->query);
 		zend_hash_destroy(&obj->intern->bound);
 		if (obj->intern->params) {
 			php_pq_params_free(&obj->intern->params);
@@ -139,19 +140,12 @@ static void php_pqstm_object_read_query(zval *object, void *o, zval *return_valu
 	RETVAL_STRING(obj->intern->query, 1);
 }
 
-static void php_pqstm_object_read_types(zval *object, void *o, zval *return_value)
+static void php_pqstm_object_read_types(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
 	int i;
-	HashTable *ht;
-	php_pqstm_object_t *obj;
-
-	obj = (php_pqstm_object_t *)o;
-	ht = (HashTable *)emalloc(sizeof(HashTable));
-
-	zend_hash_init(ht, obj->intern->params->type.count, NULL, ZVAL_PTR_DTOR, 0);
-	Z_TYPE_P(return_value) = IS_ARRAY;
-	Z_ARRVAL_P(return_value) = ht;
+	php_pqstm_object_t *obj = o;
 
+	array_init_size(return_value, obj->intern->params->type.count);
 	for (i = 0; i < obj->intern->params->type.count; i++) {
 		add_next_index_long(return_value, (long)obj->intern->params->type.oids[i]);
 	}