[pull] master from php:master - #1226
Merged
Merged
Conversation
php_stream_filter_flush() compacts unread data before appending buckets produced by a read filter. The source and destination ranges may overlap, making memcpy() undefined behavior. Additionally, resetting readpos before subtracting it from writepos leaves the buffer size unadjusted and stale data visible. Use memmove() and adjust writepos before resetting readpos, matching the existing buffer compaction logic in php_stream_fill_read_buffer(). Closes #23439
* PHP-8.4: Fix read buffer compaction in stream filter flush (#23439)
* PHP-8.5: Fix read buffer compaction in stream filter flush (#23439)
* PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5
pg_update() and pg_delete() list PGSQL_DML_ASYNC among the valid flags in the error they raise, although their masks reject it and their helpers assert it is never set. Conversely pg_insert() and pg_update() accept the whole PGSQL_CONV_OPTS set but only named PGSQL_CONV_FORCE_NULL, so PGSQL_CONV_IGNORE_DEFAULT and PGSQL_CONV_IGNORE_NOT_NULL are added. While there, widen php_pgsql_delete()'s assert to PGSQL_DML_NO_CONV, which pg_delete() accepts and the helper itself consults. Close GH-23480
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )