diff options
author | Katie Hockman <katie@golang.org> | 2021-03-10 11:52:19 -0500 |
---|---|---|
committer | Katie Hockman <katie@golang.org> | 2021-03-10 11:52:54 -0500 |
commit | ff7e6383183ff5bdd95257c0ad7db3cd96619d7f (patch) | |
tree | 8be46b6e281b8aa0477b0b8c37c8b1dd9e28fadb /src/encoding/xml/xml.go | |
parent | 1c60e0d928764b1b755c494d4a760eb51b99bc90 (diff) | |
parent | 13722418773b6a081816e8cc48131306565db1bd (diff) | |
download | go-ff7e6383183ff5bdd95257c0ad7db3cd96619d7f.tar.gz go-ff7e6383183ff5bdd95257c0ad7db3cd96619d7f.zip |
[release-branch.go1.15] all: merge release-branch.go1.15-security into release-branch.go1.15
Change-Id: I755738ad72337dcb4f942ffd1dc5d699e6bb027d
Diffstat (limited to 'src/encoding/xml/xml.go')
-rw-r--r-- | src/encoding/xml/xml.go | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/encoding/xml/xml.go b/src/encoding/xml/xml.go index adaf4daf19..6f9594d7ba 100644 --- a/src/encoding/xml/xml.go +++ b/src/encoding/xml/xml.go @@ -271,7 +271,7 @@ func NewTokenDecoder(t TokenReader) *Decoder { // it will return an error. // // Token implements XML name spaces as described by -// https://www.w3.org/TR/REC-xml-names/. Each of the +// https://www.w3.org/TR/REC-xml-names/. Each of the // Name structures contained in the Token has the Space // set to the URL identifying its name space when known. // If Token encounters an unrecognized name space prefix, @@ -285,16 +285,17 @@ func (d *Decoder) Token() (Token, error) { if d.nextToken != nil { t = d.nextToken d.nextToken = nil - } else if t, err = d.rawToken(); err != nil { - switch { - case err == io.EOF && d.t != nil: - err = nil - case err == io.EOF && d.stk != nil && d.stk.kind != stkEOF: - err = d.syntaxError("unexpected EOF") + } else { + if t, err = d.rawToken(); t == nil && err != nil { + if err == io.EOF && d.stk != nil && d.stk.kind != stkEOF { + err = d.syntaxError("unexpected EOF") + } + return nil, err } - return t, err + // We still have a token to process, so clear any + // errors (e.g. EOF) and proceed. + err = nil } - if !d.Strict { if t1, ok := d.autoClose(t); ok { d.nextToken = t |