Fix UNKNOWN default values in ext/oci8 #6089
Conversation
|
@cjbj Can you help us get this PR tested since we have no (easy) way to test these changes? |
|
@kocsismate I'm happy to help, and appreciate the PR. Can you describe the problem you are solving - I haven't dug into stubs a lot. |
ext/oci8/oci8_interface.c
Outdated
| if (!getThis() && ZEND_NUM_ARGS() > 2 && length < 0) { | ||
| if (length_is_null) { | ||
| length = -1; | ||
| else if (length < 0) { |
There was a problem hiding this comment.
This needs a closing brace for the first clause:
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -641,7 +641,7 @@ PHP_FUNCTION(oci_lob_erase)
if (length_is_null) {
length = -1;
- else if (length < 0) {
+ } else if (length < 0) {
php_error_docref(NULL, E_WARNING, "Length must be greater than or equal to 0");
RETURN_FALSE;
}
kocsismate
force-pushed
the
unknown-default-oci8
branch
from
8fa61ed to
bbeee5a
Compare
|
@cjbj Thank you very much for the help!
The reason of these changes is that the functions which are marked with an |
|
Thanks for the info and PR. LGTM. |
ext/oci8/oci8_interface.c
Outdated
| @@ -757,9 +749,10 @@ PHP_FUNCTION(oci_lob_copy) | |||
| { | |||
| zval *tmp_dest, *tmp_from, *z_descriptor_dest, *z_descriptor_from; | |||
| php_oci_descriptor *descriptor_dest, *descriptor_from; | |||
| zend_long length = 0; | |||
| zend_long length = -1; | |||
There was a problem hiding this comment.
Don't we have the same issue with the default value here?
There was a problem hiding this comment.
Yes, I didn't notice it
There was a problem hiding this comment.
I fixed the same problem in oci_lob_export() as well.
No description provided.