diff options
| author | Christopher Jones <christopher.jones@oracle.com> | 2015-08-19 10:42:53 +1000 |
|---|---|---|
| committer | Christopher Jones <christopher.jones@oracle.com> | 2015-08-19 10:42:53 +1000 |
| commit | 9047b567e346841ee73fcef27a33d609d438df69 (patch) | |
| tree | 5a16541d8753acd4938aca14f6bf9367daee7891 /ext/oci8/oci8_interface.c | |
| parent | 4df77a6c5852a8ba0ccb1a10e01a49c71d1f54b5 (diff) | |
| download | php-git-9047b567e346841ee73fcef27a33d609d438df69.tar.gz | |
Resolve build warnings. Bump ver. Better range check. Fix diffs
Diffstat (limited to 'ext/oci8/oci8_interface.c')
| -rw-r--r-- | ext/oci8/oci8_interface.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c index d161342a2d..7d845fea7c 100644 --- a/ext/oci8/oci8_interface.c +++ b/ext/oci8/oci8_interface.c @@ -385,7 +385,7 @@ PHP_FUNCTION(oci_lob_eof) PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor); - if (!php_oci_lob_get_length(descriptor, &lob_length) && lob_length >= 0) { + if (!php_oci_lob_get_length(descriptor, &lob_length)) { if (lob_length == descriptor->lob_current_position) { RETURN_TRUE; } @@ -492,8 +492,7 @@ PHP_FUNCTION(oci_lob_seek) descriptor->lob_current_position = (offset > 0) ? (ub4) offset : 0; break; } - if ((descriptor->lob_current_position < 0) || - (descriptor->lob_current_position > UB4MAXVAL-1)) { + if (descriptor->lob_current_position > UB4MAXVAL) { php_error_docref(NULL, E_WARNING, "Invalid offset or LOB position"); RETURN_FALSE; } |