]> granicus.if.org Git - php/commitdiff
It's a zend_array not Hashtable (fixed segfault)
authorXinchen Hui <laruence@php.net>
Mon, 19 May 2014 06:49:28 +0000 (14:49 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 19 May 2014 06:49:28 +0000 (14:49 +0800)
ext/pgsql/pgsql.c

index 57903104f5def57488420b3c7375722131ee48d7..f215993bf6f77dbd825a19163fdfa0012fbee733 100644 (file)
@@ -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);