php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2' into PHP-7.3

Browse Source
This commit is contained in:
Christopher Jones
2018-12-07 23:22:30 +11:00
parent 171389b435 e3946534a4
commit 49944e4bcf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/oci8/oci8_statement.c
+5 -5
View File
@@ -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);