com php-src: It's a zend_array not Hashtable (fixed segfault): ext/pgsql/pgsql.c
| From: | Xinchen Hui | Date: | Mon, 19 May 2014 06:49:28 +0000 |
| Subject: | com php-src: It's a zend_array not Hashtable (fixed segfault): ext/pgsql/pgsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78458@lists.php.net to get a copy of this message | ||
Commit: 09d2f4b195abc7b1e0b61f58e6591feb20a8dc9c
Author: Xinchen Hui <laruence@php.net> Mon, 19 May 2014 14:49:28 +0800
Parents: ed554704f3d50768653bbb0c17cc7b47e08dc790
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=09d2f4b195abc7b1e0b61f58e6591feb20a8dc9c
Log:
It's a zend_array not Hashtable (fixed segfault)
Changed paths:
M ext/pgsql/pgsql.c
Diff:
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 5790310..f215993 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);