diff options
| author | Christopher Jones <sixd@php.net> | 2008-02-25 23:50:51 +0000 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2008-02-25 23:50:51 +0000 |
| commit | b4b099ae1971a3987b83ef64f96b91e7cb6ddd81 (patch) | |
| tree | e132736ec54b941f9b682c0aec11372fc530232c /ext/oci8/oci8_lob.c | |
| parent | 6e46f25b129ba5e1575b2160e1168bf4d017e1ca (diff) | |
| download | php-git-b4b099ae1971a3987b83ef64f96b91e7cb6ddd81.tar.gz | |
MFH: OCI8: fix bug #44008 (OCI-Lob->close) & bug #44206 (ref cursor leak)
Diffstat (limited to 'ext/oci8/oci8_lob.c')
| -rw-r--r-- | ext/oci8/oci8_lob.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/oci8/oci8_lob.c b/ext/oci8/oci8_lob.c index 1b87616df6..83a6719df0 100644 --- a/ext/oci8/oci8_lob.c +++ b/ext/oci8/oci8_lob.c @@ -88,6 +88,7 @@ php_oci_descriptor *php_oci_lob_create (php_oci_connection *connection, long typ descriptor->buffering = PHP_OCI_LOB_BUFFER_DISABLED; /* buffering is off by default */ descriptor->charset_form = SQLCS_IMPLICIT; /* default value */ descriptor->charset_id = connection->charset; + descriptor->is_open = 0; if (descriptor->type == OCI_DTYPE_LOB || descriptor->type == OCI_DTYPE_FILE) { /* add Lobs & Files to hash. we'll flush them at the end */ @@ -571,7 +572,9 @@ int php_oci_lob_close (php_oci_descriptor *descriptor TSRMLS_DC) { php_oci_connection *connection = descriptor->connection; - PHP_OCI_CALL_RETURN(connection->errcode, OCILobClose, (connection->svc, connection->err, descriptor->descriptor)); + if (descriptor->is_open) { + PHP_OCI_CALL_RETURN(connection->errcode, OCILobClose, (connection->svc, connection->err, descriptor->descriptor)); + } if (connection->errcode != OCI_SUCCESS) { php_oci_error(connection->err, connection->errcode TSRMLS_CC); @@ -909,6 +912,8 @@ int php_oci_lob_write_tmp (php_oci_descriptor *descriptor, ub1 type, char *data, return 1; } + descriptor->is_open = 1; + return php_oci_lob_write(descriptor, 0, data, data_len, &bytes_written TSRMLS_CC); } /* }}} */ |