diff options
| author | Russ Cox <rsc@golang.org> | 2010-04-26 10:01:33 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-04-26 10:01:33 -0700 |
| commit | a3c4d2f8fd30316e08deb6950b0bbb6c713a55e7 (patch) | |
| tree | 57627d3efbd2d1870c7084194c54b0274a778122 /src/pkg/xml/xml.go | |
| parent | 68a702960410cfa81ff4950e478761da58b47204 (diff) | |
| download | golang-a3c4d2f8fd30316e08deb6950b0bbb6c713a55e7.tar.gz | |
xml: fix innerxml handling of & escapes
R=r
CC=golang-dev
http://codereview.appspot.com/1009041
Diffstat (limited to 'src/pkg/xml/xml.go')
| -rw-r--r-- | src/pkg/xml/xml.go | 5 |
1 files changed, 3 insertions, 2 deletions
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") } |