exp/html: replace NUL with U+FFFD in text in foreign content

Pass 5 additional tests. R=nigeltao CC=golang-dev https://golang.org/cl/6452055

exp/html: replace NUL with U+FFFD in text in foreign content
Pass 5 additional tests. R=nigeltao CC=golang-dev https://golang.org/cl/6452055
eff32f57 · Andrew Balholm · Nigel Tao · f7f91a05 · eff32f57 · eff32f57
Commit eff32f57 authored Jul 29, 2012 by Andrew Balholm Committed by Nigel Tao Jul 29, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

src/pkg/exp/html/parse.go src/pkg/exp/html/parse.go +4 -2

src/pkg/exp/html/testlogs/plain-text-unsafe.dat.log src/pkg/exp/html/testlogs/plain-text-unsafe.dat.log +5 -5

No files found.
--- a/src/pkg/exp/html/parse.go
+++ b/src/pkg/exp/html/parse.go
@@ -1846,14 +1846,16 @@ func afterAfterFramesetIM(p *parser) bool {
 	return true
 }
+const whitespaceOrNUL = whitespace + "\x00"
 // Section 12.2.5.5.
 func parseForeignContent(p *parser) bool {
 	switch p.tok.Type {
 	case TextToken:
-		p.tok.Data = strings.Replace(p.tok.Data, "\x00", "", -1)
 		if p.framesetOK {
-			p.framesetOK = strings.TrimLeft(p.tok.Data, whitespace) == ""
+			p.framesetOK = strings.TrimLeft(p.tok.Data, whitespaceOrNUL) == ""
 		}
+		p.tok.Data = strings.Replace(p.tok.Data, "\x00", "\ufffd", -1)
 		p.addText(p.tok.Data)
 	case CommentToken:
 		p.addChild(&Node{

--- a/src/pkg/exp/html/testlogs/plain-text-unsafe.dat.log
+++ b/src/pkg/exp/html/testlogs/plain-text-unsafe.dat.log
@@ -12,13 +12,13 @@ PASS "<svg><![CDATA[\x00filler\x00text\x00]]>"
 PASS "<body><!\x00>"
 PASS "<body><!\x00filler\x00text>"
 PASS "<body><svg><foreignObject>\x00filler\x00text"
-FAIL "<svg>\x00filler\x00text"
+PASS "<svg>\x00filler\x00text"
-FAIL "<svg>\x00<frameset>"
+PASS "<svg>\x00<frameset>"
-FAIL "<svg>\x00 <frameset>"
+PASS "<svg>\x00 <frameset>"
-FAIL "<svg>\x00a<frameset>"
+PASS "<svg>\x00a<frameset>"
 PASS "<svg>\x00</svg><frameset>"
 PASS "<svg>\x00 </svg><frameset>"
-FAIL "<svg>\x00a</svg><frameset>"
+PASS "<svg>\x00a</svg><frameset>"
 PASS "<svg><path></path></svg><frameset>"
 PASS "<svg><p><frameset>"
 PASS "<!DOCTYPE html><pre>\r\n\r\nA</pre>"