ext/pdo_sqlite: PDO::sqliteCreateCollection return type strenghtening. #18799
+18
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Is supposed to be Pdo_Sqlite::createCollation but behavior differs in regard of return type checks.
devnexen
force-pushed
the
pdo_sqlite_ext_create_collation
branch
from
7661ce5 to
4494e12
Compare
Girgias
approved these changes
Jun 8, 2025
Comment on lines
390
to
394
| if (Z_LVAL(retval) > 0) { | ||
| ret = 1; | ||
| } else if (Z_LVAL(retval) < 0) { | ||
| ret = -1; | ||
| } |
There was a problem hiding this comment.
Follow-up: Could we not use ZEND_NORMALIZE_BOOL here rather than doing it "manually"
nielsdos
reviewed
Jun 8, 2025
| @@ -385,14 +385,14 @@ static int php_sqlite_collation_callback(void *context, int string1_len, const v | |||
| zend_type_error("%s(): Return value of the collation callback must be of type int, %s returned", | |||
| ZSTR_VAL(func_name), zend_zval_value_name(&retval)); | |||
| zend_string_release(func_name); | |||
| zval_ptr_dtor(&retval); | |||
| return FAILURE; | |||
| ret = FAILURE; | |||
There was a problem hiding this comment.
This change in this file is wrong, why did you change this?
There was a problem hiding this comment.
In particular, you're accessing the zval as if it were a long below, but that's not the case. This means you're either interpreting garbage bytes or uninit memory.
nielsdos
reviewed
Jun 8, 2025
| zend_type_error("%s(): Return value of the collation callback must be of type int, %s returned", | ||
| ZSTR_VAL(func_name), zend_zval_value_name(&retval)); | ||
| zend_string_release(func_name); | ||
| ret = FAILURE; |
devnexen
added a commit
to devnexen/php-src
that referenced
this pull request
Jun 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Is supposed to be Pdo_Sqlite::createCollation alias but behavior differs in regard of return type checks.