summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2017-03-23 19:00:07 +0300
committerDmitry Stogov <dmitry@zend.com>2017-03-23 19:00:07 +0300
commitb5b7691ab5b708e29d9dbb5d46dde33aaf534b89 (patch)
treef7b7444651af132a736472fade03f0811266f8cd
parentced36f9b2e85587e9a433b5d60a6d9fb9044a83f (diff)
parenta0331127fe25886f7772ccbbca28cd568e3da96a (diff)
downloadphp-git-b5b7691ab5b708e29d9dbb5d46dde33aaf534b89.tar.gz
Merge branch 'PHP-7.1'
* PHP-7.1: Fixed uninitialized data
-rw-r--r--ext/oci8/oci8_statement.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c
index ad6ae5575b..934673dd7c 100644
--- a/ext/oci8/oci8_statement.c
+++ b/ext/oci8/oci8_statement.c
@@ -1722,6 +1722,7 @@ php_oci_bind *php_oci_bind_array_helper_string(zval *var, zend_long max_table_le
}
bind = emalloc(sizeof(php_oci_bind));
+ ZVAL_UNDEF(&bind->parameter);
bind->array.elements = (text *)safe_emalloc(max_table_length * (maxlength + 1), sizeof(text), 0);
memset(bind->array.elements, 0, max_table_length * (maxlength + 1) * sizeof(text));
bind->array.current_length = zend_hash_num_elements(Z_ARRVAL_P(var));
@@ -1781,6 +1782,7 @@ php_oci_bind *php_oci_bind_array_helper_number(zval *var, zend_long max_table_le
hash = HASH_OF(var);
bind = emalloc(sizeof(php_oci_bind));
+ ZVAL_UNDEF(&bind->parameter);
bind->array.elements = (ub4 *)safe_emalloc(max_table_length, sizeof(ub4), 0);
bind->array.current_length = zend_hash_num_elements(Z_ARRVAL_P(var));
bind->array.old_length = bind->array.current_length;
@@ -1820,6 +1822,7 @@ php_oci_bind *php_oci_bind_array_helper_double(zval *var, zend_long max_table_le
hash = HASH_OF(var);
bind = emalloc(sizeof(php_oci_bind));
+ ZVAL_UNDEF(&bind->parameter);
bind->array.elements = (double *)safe_emalloc(max_table_length, sizeof(double), 0);
bind->array.current_length = zend_hash_num_elements(Z_ARRVAL_P(var));
bind->array.old_length = bind->array.current_length;
@@ -1860,6 +1863,7 @@ php_oci_bind *php_oci_bind_array_helper_date(zval *var, zend_long max_table_leng
hash = HASH_OF(var);
bind = emalloc(sizeof(php_oci_bind));
+ ZVAL_UNDEF(&bind->parameter);
bind->array.elements = (OCIDate *)safe_emalloc(max_table_length, sizeof(OCIDate), 0);
bind->array.current_length = zend_hash_num_elements(Z_ARRVAL_P(var));
bind->array.old_length = bind->array.current_length;