exp/html: ignore null bytes in text

pass one additional test R=golang-dev, nigeltao CC=golang-dev https://golang.org/cl/6048051

exp/html: ignore null bytes in text
pass one additional test R=golang-dev, nigeltao CC=golang-dev https://golang.org/cl/6048051
67910572 · Andrew Balholm · Nigel Tao · 7d63ff09 · 67910572 · 67910572
Commit 67910572 authored Apr 20, 2012 by Andrew Balholm Committed by Nigel Tao Apr 20, 2012
Showing with 7 additions and 7 deletions

src/pkg/exp/html/parse.go src/pkg/exp/html/parse.go +6 -6

src/pkg/exp/html/testlogs/pending-spec-changes-plain-text-unsafe.dat.log ...l/testlogs/pending-spec-changes-plain-text-unsafe.dat.log +1 -1

No files found.
--- a/src/pkg/exp/html/parse.go
+++ b/src/pkg/exp/html/parse.go
@@ -616,25 +616,25 @@ func copyAttributes(dst *Node, src Token) {
 func inBodyIM(p *parser) bool {
 	switch p.tok.Type {
 	case TextToken:
+		d := p.tok.Data
 		switch n := p.oe.top(); n.Data {
 		case "pre", "listing", "textarea":
 			if len(n.Child) == 0 {
 				// Ignore a newline at the start of a <pre> block.
-				d := p.tok.Data
 				if d != "" && d[0] == '\r' {
 					d = d[1:]
 				}
 				if d != "" && d[0] == '\n' {
 					d = d[1:]
 				}
-				if d == "" {
-					return true
 			}
-				p.tok.Data = d
 		}
+		d = strings.Replace(d, "\x00", "", -1)
+		if d == "" {
+			return true
 		}
 		p.reconstructActiveFormattingElements()
-		p.addText(p.tok.Data)
+		p.addText(d)
 		p.framesetOK = false
 	case StartTagToken:
 		switch p.tok.Data {

--- a/src/pkg/exp/html/testlogs/pending-spec-changes-plain-text-unsafe.dat.log
+++ b/src/pkg/exp/html/testlogs/pending-spec-changes-plain-text-unsafe.dat.log
-FAIL "<body><table>\x00filler\x00text\x00"
+PASS "<body><table>\x00filler\x00text\x00"