Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

encoding/xml: make sure Encoder.Encode reports Write errors.

Browse source 
Fixes #4112.

R=remyoudompheng, daniel.morsing, dave, rsc
CC=golang-dev
https://golang.org/cl/7085053
This commit is contained in:
Olivier Saingre 2013-02-20 14:41:23 -08:00 • committed by Brad Fitzpatrick
parent 8eb80914ca
commit afde71cfbd
4 changed files with 61 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/pkg/encoding/xml/xml.go
View file

@ -1720,9 +1720,9 @@ var (
esc_cr = []byte("
")
)
// Escape writes to w the properly escaped XML equivalent
// EscapeText writes to w the properly escaped XML equivalent
// of the plain text data s.
func Escape(w io.Writer, s []byte) {
func EscapeText(w io.Writer, s []byte) error {
var esc []byte
last := 0
for i, c := range s {
@ -1746,11 +1746,25 @@ func Escape(w io.Writer, s []byte) {
default:
continue
}
w.Write(s[last:i])
w.Write(esc)
if _, err := w.Write(s[last:i]); err != nil {
return err
}
if _, err := w.Write(esc); err != nil {
return err
}
last = i + 1
}
w.Write(s[last:])
if _, err := w.Write(s[last:]); err != nil {
return err
}
return nil
}
// Escape is like EscapeText but omits the error return value.
// It is provided for backwards compatibility with Go 1.0.
// Code targeting Go 1.1 or later should use EscapeText.
func Escape(w io.Writer, s []byte) {
EscapeText(w, s)
}
// procInstEncoding parses the `encoding="..."` or `encoding='...'`