Decode UTF-8 properly from URLs

tdewolff · Jan 28, 2025 · 7ca70f9 · 7ca70f9
1 parent 6c49a1f
commit 7ca70f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/common.go b/common.go
@@ -534,7 +534,7 @@ func DecodeURL(b []byte) []byte {
 					c = c<<4 + int(b[j]-'a') + 10
 				}
 			}
-			if j == i+3 && c < 128 {
+			if j == i+3 {
 				b[i] = byte(c)
 				b = append(b[:i+1], b[i+3:]...)
 			}

diff --git a/common_test.go b/common_test.go
@@ -108,6 +108,7 @@ func TestParseDataURI(t *testing.T) {
 		{"data:;base64,()", "", "", base64.CorruptInputError(0)},
 		{"data:image/svg+xml,%3Cpath%20stroke-width='9.38%'/%3E", "image/svg+xml", "<path stroke-width='9.38%'/>", nil},
 		{"data:,%ii", "text/plain", "%ii", nil},
+		{"data:image/svg&#43;xml,%e2%ad%90", "image/svg&#43;xml", "\u2b50", nil},
 	}
 	for _, tt := range dataURITests {
 		t.Run(tt.dataURI, func(t *testing.T) {
@@ -283,7 +284,7 @@ func TestDecodeURL(t *testing.T) {
 		expected string
 	}{
 		{"%20%3F%7E", " ?~"},
-		{"%80", "%80"},
+		{"%80", "\x80"},
 		{"%2B%2b", "++"},
 		{"%' ", "%' "},
 		{"a+b", "a b"},