Repository navigation
Fix upload progress counters after separating the progress array - #24476
Closed
pdymidziuk wants to merge 2 commits into
Closed
pdymidziuk wants to merge 2 commits into
pdymidziuk wants to merge 2 commits into
Conversation
With upload_progress.cleanup=0, a multipart request containing form data after its final file can persist an incomplete bytes_processed value. The end callback separates progress->data, then writes through a cached bucket pointer that still belongs to the previous array. Resolve the bytes_processed bucket from its current array on each access instead of storing pointers across multipart events. Preserve the existing in-place updates of progress arrays shared with session data. Add a regression covering two files followed by a large form field. It fails before this change and passes afterwards. Docker debug builds passed 267 session tests with one pre-existing XFAIL, plus all RFC1867 tests with USE_ZEND_ALLOC=0. This is a targeted correctness fix and hardening change, not a verified fix for CVE-2026-109618 or CVE-2026-109619. No RCE was reproduced.
pdymidziuk
requested review from
Girgias,
bukka,
dstogov and
jorgsowa
as code owners
October 21, 2026 10:37
Member
|
Stop please. The proper fix is coming in a few hours. |
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 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.
With upload_progress.cleanup=0, a multipart request containing form data
after its final file can persist an incomplete bytes_processed value.
The end callback separates progress->data, then writes through a cached
bucket pointer that still belongs to the previous array.
Resolve the bytes_processed bucket from its current array on each access
instead of storing pointers across multipart events. Preserve the existing
in-place updates of progress arrays shared with session data.
Add a regression covering two files followed by a large form field. It
fails before this change and passes afterwards. Docker debug builds passed
267 session tests with one pre-existing XFAIL, plus all RFC1867 tests with
USE_ZEND_ALLOC=0.
This is a targeted correctness fix and hardening change, not a verified
fix for CVE-2026-109618 or CVE-2026-109619. No RCE was reproduced.