exp/html: don't insert empty text nodes

Pass 1 additional test. R=nigeltao CC=golang-dev https://golang.org/cl/6443048

exp/html: don't insert empty text nodes
Pass 1 additional test. R=nigeltao CC=golang-dev https://golang.org/cl/6443048
899be509 · Andrew Balholm · Nigel Tao · 24ae7e68 · 899be509 · 899be509
Commit 899be509 authored Jul 26, 2012 by Andrew Balholm Committed by Nigel Tao Jul 26, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

src/pkg/exp/html/parse.go src/pkg/exp/html/parse.go +3 -0

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

No files found.
--- a/src/pkg/exp/html/parse.go
+++ b/src/pkg/exp/html/parse.go
@@ -267,6 +267,9 @@ func (p *parser) fosterParent(n *Node) {
 // addText adds text to the preceding node if it is a text node, or else it
 // calls addChild with a new text node.
 func (p *parser) addText(text string) {
+	if text == "" {
+		return
+	}
 	// TODO: distinguish whitespace text from others.
 	t := p.top()
 	if i := len(t.Child); i > 0 && t.Child[i-1].Type == TextNode {

--- a/src/pkg/exp/html/testlogs/plain-text-unsafe.dat.log
+++ b/src/pkg/exp/html/testlogs/plain-text-unsafe.dat.log
@@ -4,7 +4,7 @@ PASS "<html> \x00 <frameset></frameset>"
 PASS "<html>a\x00a<frameset></frameset>"
 PASS "<html>\x00\x00<frameset></frameset>"
 PASS "<html>\x00\n <frameset></frameset>"
-FAIL "<html><select>\x00"
+PASS "<html><select>\x00"
 PASS "\x00"
 PASS "<body>\x00"
 FAIL "<plaintext>\x00filler\x00text\x00"