re2

Author: callthingsoff

src/encoding/xml/xml.go

@@ -2048,12 +2048,12 @@ func procInst(param, s string) string {
 	for i < len(s) {
 		sub := s[i:]
 		k := strings.Index(sub, param)
-		if k < 0 || k == len(sub)-1 {
+		if k < 0 || len(param)+k >= len(sub) {
 			return ""
 		}
 		i += k + 1
-		if x := sub[len(param)+k]; x == '\'' || x == '"' {
-			sep = x
+		if c := sub[len(param)+k]; c == '\'' || c == '"' {
+			sep = c
 			break
 		}
 	}

src/encoding/xml/xml_test.go

@@ -831,6 +831,8 @@ var procInstTests = []struct {
 	{`version="1.0" encoding=utf-8`, [2]string{"1.0", ""}},
 	{`encoding="FOO" `, [2]string{"", "FOO"}},
 	{`version=2.0 version="1.0" encoding=utf-7 encoding='utf-8'`, [2]string{"1.0", "utf-8"}},
+	{`version= encoding=`, [2]string{"", ""}},
+	{``, [2]string{"", ""}},
 }
 
 func TestProcInstEncoding(t *testing.T) {