com php-src: Fixed LOB implementation size_t/zend_long mi smatch reported by gcov: NEWS ext/oci8/oci8_i nterface.c
| From: | Christopher Jones | Date: | Thu, 19 Nov 2015 22:14:05 +0000 |
| Subject: | com php-src: Fixed LOB implementation size_t/zend_long mi smatch reported by gcov: NEWS ext/oci8/oci8_i nterface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89911@lists.php.net to get a copy of this message | ||
Commit: f66e25a82b4cccb7b3b15ebc8e59e3695b02ddc6
Author: Christopher Jones <christopher.jones@oracle.com> Fri, 20 Nov 2015 09:14:05
+1100
Parents: 8b32fe80aeb9761e43c1e0d0328cb03462aac0e8
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f66e25a82b4cccb7b3b15ebc8e59e3695b02ddc6
Log:
Fixed LOB implementation size_t/zend_long mismatch reported by gcov
Changed paths:
M NEWS
M ext/oci8/oci8_interface.c
Diff:
diff --git a/NEWS b/NEWS
index e4739cb..c023bbc 100644
--- a/NEWS
+++ b/NEWS
@@ -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 7d845fe..ec73513 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);
}
}