summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <christopher.jones@oracle.com>2018-12-07 23:22:30 +1100
committerChristopher Jones <christopher.jones@oracle.com>2018-12-07 23:22:30 +1100
commit49944e4bcf615285ce96beb47989a03f995e6cf0 (patch)
treea798f006cc59f1ad1b76fe0187c97f0e87a0496b
parent171389b4356af4232d2825b29d63104d7db9a4b1 (diff)
parente3946534a47afc6678eccaf5217632221ed297df (diff)
downloadphp-git-49944e4bcf615285ce96beb47989a03f995e6cf0.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
-rw-r--r--ext/oci8/oci8_statement.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c
index 68ee6b5762..74ebe9b833 100644
--- a/ext/oci8/oci8_statement.c
+++ b/ext/oci8/oci8_statement.c
@@ -1002,7 +1002,7 @@ int php_oci_bind_post_exec(zval *data)
HashTable *hash;
SEPARATE_ARRAY(zv);
- hash = HASH_OF(zv);
+ hash = Z_ARRVAL_P(zv);
zend_hash_internal_pointer_reset(hash);
switch (bind->array.type) {
@@ -1727,7 +1727,7 @@ php_oci_bind *php_oci_bind_array_helper_string(zval *var, zend_long max_table_le
zval *entry;
SEPARATE_ARRAY(var); /* TODO: may be use new HashTable iteration and prevent inplace modification */
- hash = HASH_OF(var);
+ hash = Z_ARRVAL_P(var);
if (maxlength == -1) {
zend_hash_internal_pointer_reset(hash);
@@ -1801,7 +1801,7 @@ php_oci_bind *php_oci_bind_array_helper_number(zval *var, zend_long max_table_le
zval *entry;
SEPARATE_ARRAY(var); /* TODO: may be use new HashTable iteration and prevent inplace modification */
- hash = HASH_OF(var);
+ hash = Z_ARRVAL_P(var);
bind = emalloc(sizeof(php_oci_bind));
ZVAL_UNDEF(&bind->val);
@@ -1842,7 +1842,7 @@ php_oci_bind *php_oci_bind_array_helper_double(zval *var, zend_long max_table_le
zval *entry;
SEPARATE_ARRAY(var); /* TODO: may be use new HashTable iteration and prevent inplace modification */
- hash = HASH_OF(var);
+ hash = Z_ARRVAL_P(var);
bind = emalloc(sizeof(php_oci_bind));
ZVAL_UNDEF(&bind->val);
@@ -1884,7 +1884,7 @@ php_oci_bind *php_oci_bind_array_helper_date(zval *var, zend_long max_table_leng
sword errstatus;
SEPARATE_ARRAY(var); /* TODO: may be use new HashTable iteration and prevent inplace modification */
- hash = HASH_OF(var);
+ hash = Z_ARRVAL_P(var);
bind = emalloc(sizeof(php_oci_bind));
ZVAL_UNDEF(&bind->val);