summaryrefslogtreecommitdiffhomepage
path: root/replacer.go
diff options
context:
space:
mode:
authorBill Glover <[email protected]>2020-03-11 22:12:00 +0000
committerGitHub <[email protected]>2020-03-11 16:12:00 -0600
commitcfe85a9fe625fea55dc4f809fd91b5c061064508 (patch)
treefe77310c343f15acb09552edc435b73c755483c4 /replacer.go
parent90f1f7bce75686d3a9864e1f36abf15930b3fc5f (diff)
downloadcaddy-cfe85a9fe625fea55dc4f809fd91b5c061064508.tar.gz
caddy-cfe85a9fe625fea55dc4f809fd91b5c061064508.zip
Fix #3130: Crash at fuzzing target replacer (#3133)
* Fix #3130: Crash at fuzzing target replacer * Add additional test case based on fuzzer feedback
Diffstat (limited to 'replacer.go')
-rw-r--r--replacer.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/replacer.go b/replacer.go
index 88234046f..d1c58e8de 100644
--- a/replacer.go
+++ b/replacer.go
@@ -124,6 +124,8 @@ func (r *Replacer) replace(input, empty string,
// iterate the input to find each placeholder
var lastWriteCursor int
+
+scan:
for i := 0; i < len(input); i++ {
// check for escaped braces
@@ -145,7 +147,11 @@ func (r *Replacer) replace(input, empty string,
// if necessary look for the first closing brace that is not escaped
for end > 0 && end < len(input)-1 && input[end-1] == phEscape {
- end = strings.Index(input[end+1:], string(phClose)) + end + 1
+ nextEnd := strings.Index(input[end+1:], string(phClose))
+ if nextEnd < 0 {
+ continue scan
+ }
+ end += nextEnd + 1
}
// write the substring from the last cursor to this point