diff options
| author | Christopher Jones <christopher.jones@oracle.com> | 2015-11-20 09:14:05 +1100 |
|---|---|---|
| committer | Christopher Jones <christopher.jones@oracle.com> | 2015-11-20 09:14:05 +1100 |
| commit | f66e25a82b4cccb7b3b15ebc8e59e3695b02ddc6 (patch) | |
| tree | 52bb4b41e3328793f726ebb5d7ac4a958150cee6 | |
| parent | 8b32fe80aeb9761e43c1e0d0328cb03462aac0e8 (diff) | |
| download | php-git-f66e25a82b4cccb7b3b15ebc8e59e3695b02ddc6.tar.gz | |
Fixed LOB implementation size_t/zend_long mismatch reported by gcov
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/oci8/oci8_interface.c | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -16,6 +16,7 @@ PHP NEWS (Laruence) - OCI8: + . Fixed LOB implementation size_t/zend_long mismatch reported by gcov. (Senthil) . Fixed memory leak with LOBs. (Senthil) - SOAP: diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c index 7d845fea7c..ec73513024 100644 --- a/ext/oci8/oci8_interface.c +++ b/ext/oci8/oci8_interface.c @@ -534,7 +534,7 @@ PHP_FUNCTION(oci_lob_write) { zval *tmp, *z_descriptor = getThis(); php_oci_descriptor *descriptor; - zend_long data_len; + size_t data_len; zend_long write_len = 0; ub4 bytes_written; char *data; @@ -545,7 +545,7 @@ PHP_FUNCTION(oci_lob_write) } if (ZEND_NUM_ARGS() == 2) { - data_len = MIN(data_len, write_len); + data_len = MIN((zend_long) data_len, write_len); } } else { @@ -554,7 +554,7 @@ PHP_FUNCTION(oci_lob_write) } if (ZEND_NUM_ARGS() == 3) { - data_len = MIN(data_len, write_len); + data_len = MIN((zend_long) data_len, write_len); } } |