X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqconn.c;h=5d5da7a38b3c86315cfcb100f45656d176c90781;hp=cb2d72f08321385cde82d901de7406064d60a34d;hb=a04c77181328660f1ca748cb82a20abe43cebb65;hpb=6e672843c6d37b9d84f632f173d6bdf8025564b2 diff --git a/src/php_pqconn.c b/src/php_pqconn.c index cb2d72f..5d5da7a 100644 --- a/src/php_pqconn.c +++ b/src/php_pqconn.c @@ -1713,12 +1713,11 @@ static int apply_set_converter(void *p TSRMLS_DC, int argc, va_list argv, zend_h HashTable *converters = va_arg(argv, HashTable *); tmp = *zoid; + Z_ADDREF_P(tmp); convert_to_long_ex(&tmp); Z_ADDREF_PP(zcnv); zend_hash_index_update(converters, Z_LVAL_P(tmp), zcnv, sizeof(zval *), NULL); - if (tmp != *zoid) { - zval_ptr_dtor(&tmp); - } + zval_ptr_dtor(&tmp); return ZEND_HASH_APPLY_KEEP; } @@ -1745,11 +1744,10 @@ static PHP_METHOD(pqconn, setConverter) { zend_call_method_with_0_params(&zcnv, NULL, NULL, "converttypes", &zoids); tmp = zoids; - convert_to_array_ex(&zoids); - zend_hash_apply_with_arguments(Z_ARRVAL_P(zoids) TSRMLS_CC, apply_set_converter, 2, &zcnv, &obj->intern->converters); - if (tmp != zoids) { - zval_ptr_dtor(&tmp); - } + Z_ADDREF_P(tmp); + convert_to_array_ex(&tmp); + zend_hash_apply_with_arguments(Z_ARRVAL_P(tmp) TSRMLS_CC, apply_set_converter, 2, &zcnv, &obj->intern->converters); + zval_ptr_dtor(&tmp); zval_ptr_dtor(&zoids); } }