Conversation
Account for the unmatched tail after a successful substitution before emitting the result. This keeps SubstituteMaxLineLength effective for flattened literal substitutions and for both regular-expression paths.
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.
SubstituteMaxLineLengthis intended to cap the resulting line length, but successful substitutions do not consistently account for the unmatched tail after the final match.On current trunk (
118b84ae18a59ff1e3b99cd1da28da2d0c0c180c), withSubstituteMaxLineLength 10, a 10-byte line where an early match expands by one byte can produce an 11-byte response instead of returningAPR_ENOMEM.Before this change, the following all exceeded the configured limit:
q) mode: HTTP 200 / 11-byte bodyn), flatten mode: HTTP 200 / 11-byte bodyThe literal quick path already rejected the same case because it separately checks the remaining bucket length.
This change accounts for the final unmatched tail in the two flatten paths and in the regex quick path.
Validation against a current-trunk build with
mod_substituteenabled:f, regexq, literalnf, and literalnqgit diff --check: cleanThis is a
SubstituteMaxLineLengthenforcement / memory-limit hardening fix. I have not demonstrated memory corruption, an out-of-bounds access, or another exploit primitive.