From a3c4d2f8fd30316e08deb6950b0bbb6c713a55e7 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 26 Apr 2010 10:01:33 -0700 Subject: xml: fix innerxml handling of & escapes R=r CC=golang-dev http://codereview.appspot.com/1009041 --- src/pkg/xml/xml.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/pkg/xml/xml.go') diff --git a/src/pkg/xml/xml.go b/src/pkg/xml/xml.go index 410b0f77c..1ad1039f6 100644 --- a/src/pkg/xml/xml.go +++ b/src/pkg/xml/xml.go @@ -795,8 +795,9 @@ Input: var i int CharLoop: for i = 0; i < len(p.tmp); i++ { - p.tmp[i], p.err = p.r.ReadByte() - if p.err != nil { + var ok bool + p.tmp[i], ok = p.getc() + if !ok { if p.err == os.EOF { p.err = p.syntaxError("unexpected EOF") } -- cgit v1.2.3