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

27
src/pkg/encoding/xml/marshal.go
View file

@ -193,7 +193,9 @@ func (p *printer) marshalValue(val reflect.Value, finfo *fieldInfo) error {
if xmlns != "" {
p.WriteString(` xmlns="`)
// TODO: EscapeString, to avoid the allocation.
Escape(p, []byte(xmlns))
if err := EscapeText(p, []byte(xmlns)); err != nil {
return err
}
p.WriteByte('"')
}
@ -252,19 +254,22 @@ func (p *printer) marshalSimple(typ reflect.Type, val reflect.Value) error {
p.WriteString(strconv.FormatFloat(val.Float(), 'g', -1, val.Type().Bits()))
case reflect.String:
// TODO: Add EscapeString.
Escape(p, []byte(val.String()))
EscapeText(p, []byte(val.String()))
case reflect.Bool:
p.WriteString(strconv.FormatBool(val.Bool()))
case reflect.Array:
// will be [...]byte
bytes := make([]byte, val.Len())
for i := range bytes {
bytes[i] = val.Index(i).Interface().(byte)
var bytes []byte
if val.CanAddr() {
bytes = val.Slice(0, val.Len()).Bytes()
} else {
bytes = make([]byte, val.Len())
reflect.Copy(reflect.ValueOf(bytes), val)
}
Escape(p, bytes)
EscapeText(p, bytes)
case reflect.Slice:
// will be []byte
Escape(p, val.Bytes())
EscapeText(p, val.Bytes())
default:
return &UnsupportedTypeError{typ}
}
@ -298,10 +303,14 @@ func (p *printer) marshalStruct(tinfo *typeInfo, val reflect.Value) error {
case reflect.Bool:
Escape(p, strconv.AppendBool(scratch[:0], vf.Bool()))
case reflect.String:
Escape(p, []byte(vf.String()))
if err := EscapeText(p, []byte(vf.String())); err != nil {
return err
}
case reflect.Slice:
if elem, ok := vf.Interface().([]byte); ok {
Escape(p, elem)
if err := EscapeText(p, elem); err != nil {
return err
}
}
case reflect.Struct:
if vf.Type() == timeType {