scanner: scanHeredoc(): Accept any number of CRs (\r) at end of line.

When there are multiple cartridge returns at the end of the line, the regular expression will consider n-1 of them to be part of the string. Later, the last `\r` is removed. That may mean that a line that did previously *not* terminate a heredoc string may now terminate it, changing the meaning of the HCL file.
danny-cheung · Apr 3, 2018 · 25340db · 25340db
1 parent 6a21c5a
commit 25340db
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/hcl/scanner/scanner.go b/hcl/scanner/scanner.go
@@ -440,9 +440,9 @@ func (s *Scanner) scanHeredoc() {
 
 	var identRegexp *regexp.Regexp
 	if identBytes[0] == '-' {
-		identRegexp = regexp.MustCompile(fmt.Sprintf(`^[[:space:]]*%s\z`, identBytes[1:]))
+		identRegexp = regexp.MustCompile(fmt.Sprintf(`^[[:space:]]*%s\r*\z`, identBytes[1:]))
 	} else {
-		identRegexp = regexp.MustCompile(fmt.Sprintf(`^[[:space:]]*%s\z`, identBytes))
+		identRegexp = regexp.MustCompile(fmt.Sprintf(`^[[:space:]]*%s\r*\z`, identBytes))
 	}
 
 	// Read the actual string value