Commit c0a824aa authored by Volker Dobler's avatar Volker Dobler Committed by Rob Pike

strconv: fix CanBackquote for invalid UTF-8

Make CanBackquote(invalid UTF-8) return false.

Also add two test which show that CanBackquote reports
true for strings containing a BOM.

Fixes #7572.

LGTM=r
R=golang-codereviews, bradfitz, r
CC=golang-codereviews
https://golang.org/cl/111780045
parent deae10e0
......@@ -143,9 +143,16 @@ func AppendQuoteRuneToASCII(dst []byte, r rune) []byte {
// unchanged as a single-line backquoted string without control
// characters other than space and tab.
func CanBackquote(s string) bool {
for i := 0; i < len(s); i++ {
c := s[i]
if (c < ' ' && c != '\t') || c == '`' || c == '\u007F' {
for len(s) > 0 {
r, wid := utf8.DecodeRuneInString(s)
s = s[wid:]
if wid > 1 {
continue // All multibyte runes are correctly encoded and assumed printable.
}
if r == utf8.RuneError {
return false
}
if (r < ' ' && r != '\t') || r == '`' || r == '\u007F' {
return false
}
}
......
......@@ -146,6 +146,10 @@ var canbackquotetests = []canBackquoteTest{
{`ABCDEFGHIJKLMNOPQRSTUVWXYZ`, true},
{`abcdefghijklmnopqrstuvwxyz`, true},
{`☺`, true},
{"\x80", false},
{"a\xe0\xa0z", false},
{"\ufeffabc", true},
{"a\ufeffz", true},
}
func TestCanBackquote(t *testing.T) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment