summaryrefslogtreecommitdiff
path: root/ext/oci8/oci8.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2017-09-20 16:46:04 +0300
committerDmitry Stogov <dmitry@zend.com>2017-09-20 16:46:04 +0300
commit9a01fe712a684dd0c6c6b36c48e7d16b78d9108d (patch)
tree0d5404f361d0f619812e4381d74bd9e1e89db81d /ext/oci8/oci8.c
parent9641586efa861abc1f6b1dba9efba73a065e3ca5 (diff)
downloadphp-git-9a01fe712a684dd0c6c6b36c48e7d16b78d9108d.tar.gz
Fixed few ext/oci8 bugs
Diffstat (limited to 'ext/oci8/oci8.c')
-rw-r--r--ext/oci8/oci8.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 93e7bce2a3..8a26cf66ca 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -1402,6 +1402,8 @@ void php_oci_define_hash_dtor(zval *data)
define->name = NULL;
}
+ zval_ptr_dtor(&define->val);
+
efree(define);
}
/* }}} */
@@ -1414,9 +1416,9 @@ void php_oci_bind_hash_dtor(zval *data)
{
php_oci_bind *bind = (php_oci_bind *) Z_PTR_P(data);
- if (!Z_ISUNDEF(bind->parameter)) {
- zval_ptr_dtor(&bind->parameter);
- ZVAL_UNDEF(&bind->parameter);
+ if (!Z_ISUNDEF(bind->val)) {
+ zval_ptr_dtor(&bind->val);
+ ZVAL_UNDEF(&bind->val);
}
if (bind->array.elements) {
@@ -2642,7 +2644,7 @@ void php_oci_fetch_row (INTERNAL_FUNCTION_PARAMETERS, int mode, int expected_arg
if (placeholder == NULL) {
placeholder = return_value;
} else {
- zval_dtor(placeholder);
+ zval_ptr_dtor(placeholder);
}
array_init(placeholder);