Bugfix: early ending end tag

tdewolff · Feb 15, 2016 · bdad3ed · bdad3ed
1 parent f558b7f
commit bdad3ed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/svg/svg_test.go b/svg/svg_test.go
@@ -43,7 +43,6 @@ func TestSVG(t *testing.T) {
 		{`<!DOCTYPE bla><?xml?><!-- comment --><metadata/>`, ``},
 
 		{`<polygon fill="none" stroke="#000" points="-0.1,"/>`, `<polygon fill="none" stroke="#000" points="-0.1,"/>`}, // #45
-		{`</0`, `</0`}, // go fuzz
 	}
 
 	m := minify.New()

diff --git a/xml/xml.go b/xml/xml.go
@@ -155,8 +155,12 @@ func (o *Minifier) Minify(m *minify.M, w io.Writer, r io.Reader, _ map[string]st
 				return err
 			}
 		case xml.EndTagToken:
-			t.Data[2+len(t.Text)] = '>'
-			if _, err := w.Write(t.Data[:2+len(t.Text)+1]); err != nil {
+			if len(t.Data) > 2+len(t.Text) {
+				t.Data[2+len(t.Text)] = '>'
+				if _, err := w.Write(t.Data[:2+len(t.Text)+1]); err != nil {
+					return err
+				}
+			} else if _, err := w.Write(t.Data); err != nil {
 				return err
 			}
 		}

diff --git a/xml/xml_test.go b/xml/xml_test.go
@@ -34,6 +34,8 @@ func TestXML(t *testing.T) {
 		{"<x a=\"&quot;&quot;'\"></x>", "<x a='\"\"&#39;'/>"},
 		{"<!DOCTYPE foo SYSTEM \"Foo.dtd\">", "<!DOCTYPE foo SYSTEM \"Foo.dtd\">"},
 		{"text <!--comment--> text", "text text"},
+
+		{`</0`, `</0`}, // go fuzz
 	}
 
 	m := minify.New()