diff options
| author | Xinchen Hui <laruence@php.net> | 2014-05-19 14:49:28 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-05-19 14:49:28 +0800 |
| commit | 09d2f4b195abc7b1e0b61f58e6591feb20a8dc9c (patch) | |
| tree | b0f5656588962a0ea4b4bc8f49090c63b3f157a8 | |
| parent | ed554704f3d50768653bbb0c17cc7b47e08dc790 (diff) | |
| download | php-git-09d2f4b195abc7b1e0b61f58e6591feb20a8dc9c.tar.gz | |
It's a zend_array not Hashtable (fixed segfault)
| -rw-r--r-- | ext/pgsql/pgsql.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 57903104f5..f215993bf6 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -2764,7 +2764,8 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, ZVAL_COPY_VALUE(&dataset, return_value); object_and_properties_init(return_value, ce, NULL); - zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC); + zend_merge_properties(return_value, Z_ARRVAL(dataset), 0 TSRMLS_CC); + zval_ptr_dtor(&dataset); if (ce->constructor) { fci.size = sizeof(fci); |