fix(caddyfile): infinite loop on unclosed braces #7571
Merged
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
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #7571 +/- ##
==========================================
+ Coverage 55.70% 62.62% +6.92%
==========================================
Files 224 274 +50
Lines 10016 18320 +8304
==========================================
+ Hits 5579 11473 +5894
- Misses 3978 6181 +2203
- Partials 459 666 +207 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
974c80a to
77e2ff4
Compare
Collaborator
Author
|
The branch used in the Caddyfile PR coredns/caddy#10 is used in this PR and all tests pass. I'll keep this as "WIP" until:
I'll then finalise this and update |
Update coredns/caddy to a version where Dispenser.NextBlock() checks Next() and stops at EOF. This ensures forward progress and prevents an infinite loop when a block is missing a closing '}' under certain conditions. Added a regression test. Signed-off-by: Ville Vesilehto <[email protected]>
77e2ff4 to
36e6010
Compare
Merged
yongtang
approved these changes
Sep 30, 2025
Collaborator
Author
|
Thanks @yongtang! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
1. Why is this pull request needed and what does it do?
Update
coredns/caddysoDispenser.NextBlock()checksNext()return value and stops at EOF. This prevents an infinite loop when a block is opened but its closing "}" is never seen before EOF. For example, due to a missing brace or malformed/commented input with control/non‑UTF‑8 bytes (such ashosts#…\x0c{) that hides the terminator.Added a regression test and refactored the
corefile_test.goto use test cases. If you run the test againstmasteryou will see it times out, due to infinite loop.2. Which issues (if any) are related?
Fixes OSS-Fuzz finding #446778634 + group
5160400776724480.3. Which documentation changes (if any) need to be made?
None.
4. Does this introduce a backward incompatible change or deprecation?
No.